Changeset 18195 for gli

Timestamp:

2008-12-12T15:04:56+13:00 (15 years ago)

Author:

ak19

Message:

Fixed a bug where GS3 crashed with infinite ?s printed to the screen when creating a new collection (or closing an open one). The bug turned out to be that the XML stream was read as chars instead of as ints.

File:

• gli/trunk/src/org/greenstone/gatherer/util/RemoveContentBeforeRootElementXMLReader.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/util/RemoveContentBeforeRootElementXMLReader.java

@@ -18 +18 @@
 
         //read up to the xml indicator
-        int foundBytes = 0; 
-        char c = 0;
+        int foundBytes = 0;
+        int c = 0;
         while ( c != -1 ) {
             try {
-                c = (char)ur.read();
+                c = ur.read();
             } catch( Exception e ) {
                 System.err.println( "Exception while reading underlying Reader in RemoveContentBeforeRootElementXMLReader" );
             }
-
-            if ( c == xmlIndicator[foundBytes] ) {
+            
+            if ( c == (int)xmlIndicator[foundBytes] ) {
                 foundBytes++;
-            } else {
-                System.out.print( c );
+            } else {                
+                if ( foundBytes != 0 ) {
+                for ( int i=0; i<foundBytes; i++ ) {
+                    System.out.print( (char)xmlIndicator[i] );
+                }
                 foundBytes = 0;
+                }
+                if ( c != -1 ) {
+                System.out.print( (char)c );
+                }
             }
 
             if ( foundBytes == xmlIndicator.length ) {
-                //System.out.println();
-                return;
+                return;
             }
 
         }
+        
         System.err.println( "RemoveContentBeforeRootElementXMLReader:\n" +
-            "The XML being loaded was did not contain the '<?xml' string as expected" );
-
+            "The XML being loaded did not contain the '<?xml' string as expected" );
     }