Changeset 7396 for trunk/Res_Piccolo/com/bluecast/xml/XMLStreamReader.java

Timestamp:

11/21/06 13:35:34 (6 years ago)

Author:

sys

Message:

bug dans le reader qui dupliquait la déclaration xml + suppr rewindDeclaration non utilisé et manifestement bugué

File:

• trunk/Res_Piccolo/com/bluecast/xml/XMLStreamReader.java (modified) (6 diffs)

trunk/Res_Piccolo/com/bluecast/xml/XMLStreamReader.java

@@ -68 +68 @@
      *            XML declaration. True will dish out the entire document.
      */
-    public XMLStreamReader (InputStream in, boolean rewindDeclaration) throws IOException
+    public XMLStreamReader (InputStream in) throws IOException
     {
-        this(in, null, rewindDeclaration);
+        this(in, null);
     }
 
@@ -76 +76 @@
      * Creates an XMLStreamReader while specifying a character encoding.
      */
-    public XMLStreamReader (InputStream in, String encoding,
-                            boolean rewindDeclaration) throws IOException
+    public XMLStreamReader (InputStream in, String encoding) throws IOException
     {
-        reset(in, encoding, rewindDeclaration);
+        reset(in, encoding);
     }
 
@@ -85 +84 @@
      * Reuses this XMLStreamReader for a different InputStream.
      */
-    public void reset (InputStream in, String encoding,
-                       boolean rewindDeclaration) throws IOException {
+    public void reset (InputStream in, String encoding) throws IOException {
         super.resetInput();
         this.in = in;
         eofReached = false;
-        this.rewindDeclaration = rewindDeclaration;
         useDeclaredEncoding = false;
         bbufPos = bbufEnd = 0;
@@ -675 +672 @@
         
         int bbufPosTemp = bbufPos + decodeResult[0];
-        cbufEnd = decodeResult[1];
+        int cbufEndTemp = decodeResult[1];
         
-        while(r == -2 && ! eofReached && cbufEnd < cbuf.length) {
+        while(r == -2 && ! eofReached && cbufEndTemp < cbuf.length) {
             fillByteBuffer();
             r = decoder.decodeXMLDecl(bbuf, bbufPosTemp, bbufEnd - bbufPosTemp,
-                    cbuf, cbufPos+cbufEnd, cbuf.length-cbufEnd,
+                    cbuf, cbufPos+cbufEndTemp, cbuf.length-cbufEndTemp,
                     decodeResult);
             bbufPosTemp += decodeResult[0];
-                    cbufEnd += decodeResult[1];
-        }
-
-        int numCharsParsed = parseXMLDeclaration(cbuf,0,cbufEnd);
+                    cbufEndTemp += decodeResult[1];
+        }
+
+        parseXMLDeclaration(cbuf,0,cbufEndTemp);
 
         //if (numCharsParsed > 0) {
@@ -694 +691 @@
 
             // Skip the XML declaration unless told otherwise
-            if (!rewindDeclaration)
-                cbufPos += numCharsParsed;
+            //if (!rewindDeclaration)
+            //    cbufPos += numCharsParsed;
 
             // If another encoding was specified, use it instead of the guess.
@@ -702 +699 @@
                 && !declaredEncoding.equalsIgnoreCase(encoding)) {
 
-                cbufPos = cbufEnd = 0;
+                cbufPos = cbufEndTemp = 0;
+                bbufPos = initialBBufPos;
                 decoder.reset();
-
-
-                if (rewindDeclaration)
-                    bbufPos = initialBBufPos;
-                else
-                    bbufPos = numCharsParsed*minBytesPerChar;
 
                 setEncoding(declaredEncoding);