Changeset 587 for apps

Timestamp:

11/27/09 09:31:48 (3 years ago)

Author:

jonmaycock

Message:

Minor tweak to TXT parsing

Files:

• apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/dns/DNSInputStream.java (modified) (4 diffs)

apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/dns/DNSInputStream.java

@@ -38 +38 @@
  *
  * @author John Cundall, Ben Dowling, Jonathan Maycock
- * @version $Id: DNSInputStream.java,v 1.19 2009/11/06 11:55:58 jm2 Exp $
+ * @version $Id: DNSInputStream.java,v 1.20 2009/11/27 09:10:09 jm2 Exp $
  */
 public class DNSInputStream extends ByteArrayInputStream
@@ -427 +427 @@
     {
         position = 0;
-        final String txtStr = readString();        
+        String txtStr = readString();        
         
         if (txtStr.trim().equals( KEYWORD ))
@@ -466 +466 @@
             
             if (type.equals( DOMAIN_DISPLAY ))
-            {                
-                return new DNSTxtDDSResourceRecord( ttl, txtStr, readString(), version.equals( "1" ) );
+            {           
+                String dds = readString();
+                while (position < rrBytes)
+                {
+                    readString();              
+                }
+                return new DNSTxtDDSResourceRecord( ttl, txtStr, dds, version.equals( "1" ) );
             }
             else if (type.equals( TSM_PRIVATE_DATA_AVAILABLE ))
@@ -538 +543 @@
         else
         {
+            while (position < rrBytes)
+            {
+                txtStr += readString();
+            }
             return new DNSTxtHeaderResourceRecord( ttl, txtStr );
         }