svn commit: r507452 - in /mina/branches: 1.0/core/src/main/java/org/apache/mina/common/ByteBuffer.java 1.1/core/src/main/java/org/apache/mina/common/ByteBuffer.java

[trustin]

Author: trustin
Date: Wed Feb 14 01:38:49 2007
New Revision: 507452

URL: http://svn.apache.org/viewvc?view=rev&rev=507452
Log:
Fixed issue: DIRMINA-349 (ByteBuffer.getString() has bug,code piece: if( ( 
get() == 0 ) && ( get() == 0 ) ), in ByteBuffer.java line 982 and line 
1105,mina1.0.0)
* Fixed wrong NUL detection in UTF-16 strings


Modified:
    mina/branches/1.0/core/src/main/java/org/apache/mina/common/ByteBuffer.java
    mina/branches/1.1/core/src/main/java/org/apache/mina/common/ByteBuffer.java

Modified: 
mina/branches/1.0/core/src/main/java/org/apache/mina/common/ByteBuffer.java
URL: 
http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/common/ByteBuffer.java?view=diff&rev=507452&r1=507451&r2=507452
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/common/ByteBuffer.java 
(original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/common/ByteBuffer.java 
Wed Feb 14 01:38:49 2007
@@ -979,7 +979,9 @@
         {
             while( remaining() >= 2 )
             {
-                if( ( get() == 0 ) && ( get() == 0 ) )
+               boolean highZero = ( get() == 0 );
+               boolean lowZero = ( get() == 0 );
+               if( highZero && lowZero )
                 {
                     break;
                 }
@@ -1102,7 +1104,9 @@
         {
             for( i = 0; i < fieldSize; i += 2 )
             {
-                if( ( get() == 0 ) && ( get() == 0 ) )
+               boolean highZero = ( get() == 0 );
+               boolean lowZero = ( get() == 0 );
+               if( highZero && lowZero )
                 {
                     break;
                 }

Modified: 
mina/branches/1.1/core/src/main/java/org/apache/mina/common/ByteBuffer.java
URL: 
http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/common/ByteBuffer.java?view=diff&rev=507452&r1=507451&r2=507452
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/common/ByteBuffer.java 
(original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/common/ByteBuffer.java 
Wed Feb 14 01:38:49 2007
@@ -979,7 +979,9 @@
         {
             while( remaining() >= 2 )
             {
-                if( ( get() == 0 ) && ( get() == 0 ) )
+               boolean highZero = ( get() == 0 );
+               boolean lowZero = ( get() == 0 );
+               if( highZero && lowZero )
                 {
                     break;
                 }
@@ -1102,7 +1104,9 @@
         {
             for( i = 0; i < fieldSize; i += 2 )
             {
-                if( ( get() == 0 ) && ( get() == 0 ) )
+               boolean highZero = ( get() == 0 );
+               boolean lowZero = ( get() == 0 );
+               if( highZero && lowZero )
                 {
                     break;
                 }