removed some UTF-8 conversions by checking values JAVA-194

erh · erh · commit 306e36c148c1 · 2010-10-21T09:05:08.000-04:00
diff --git a/src/main/org/bson/BSONDecoder.java b/src/main/org/bson/BSONDecoder.java
@@ -295,9 +295,15 @@ void fill( byte b[] , int len )
             }
         }
 
+        boolean _isAscii( byte b ){
+            return b >=0 && b <= 127;
+        }
+
         String readCStr()
             throws IOException {
             
+            boolean isAcii = true;
+
             // short circuit 1 byte strings
             {
                 _random[0] = read();
@@ -315,23 +321,30 @@ String readCStr()
                 _stringBuffer.reset();
                 _stringBuffer.write( _random[0] );
                 _stringBuffer.write( _random[1] );
-
+                
+                isAcii = _isAscii( _random[0] ) && _isAscii( _random[1] );
             }
-
-
+            
+            
             while ( true ){
                 byte b = read();
                 if ( b == 0 )
                     break;
                 _stringBuffer.write( b );
+                isAcii = isAcii && _isAscii( b );
             }
-
+            
             String out = null;
-            try {
-                out = _stringBuffer.asString( "UTF-8" );
+            if ( isAcii ){
+                out = _stringBuffer.asString();
             }
-            catch ( UnsupportedOperationException e ){
-                throw new RuntimeException( "impossible" , e );
+            else {
+                try {
+                    out = _stringBuffer.asString( "UTF-8" );
+                }
+                catch ( UnsupportedOperationException e ){
+                    throw new RuntimeException( "impossible" , e );
+                }
             }
             _stringBuffer.reset();
             return out;
