[MMBASE SCM] r35618 - mmbase/trunk/src/org/mmbase/util

[michiel]

Author: michiel
Date: 2009-06-03 15:40:26 +0200 (Wed, 03 Jun 2009)
New Revision: 35618

Modified:
   mmbase/trunk/src/org/mmbase/util/SerializableInputStream.java
Log:
should reset the streams after use

Modified: mmbase/trunk/src/org/mmbase/util/SerializableInputStream.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/SerializableInputStream.java       
2009-06-03 13:36:17 UTC (rev 35617)
+++ mmbase/trunk/src/org/mmbase/util/SerializableInputStream.java       
2009-06-03 13:40:26 UTC (rev 35618)
@@ -285,18 +285,23 @@
     protected static boolean inputStreamEquals(SerializableInputStream in1, 
SerializableInputStream in2) throws IOException {
         in1.mark(Integer.MAX_VALUE);
         in2.mark(Integer.MAX_VALUE);
-        final byte[] buffer1 = new byte[1024];
-        final byte[] buffer2 = new byte[1024];
-        while (true) {
-            int n1 = in1.read(buffer1);
-            int n2 = in2.read(buffer2);
-            if (n1 != n2) return false;
-            if (n1 == -1) break;
-            if ( ! java.util.Arrays.equals(buffer1, buffer2)) {
-                return false;
+        try {
+            final byte[] buffer1 = new byte[1024];
+            final byte[] buffer2 = new byte[1024];
+            while (true) {
+                int n1 = in1.read(buffer1);
+                int n2 = in2.read(buffer2);
+                if (n1 != n2) return false;
+                if (n1 == -1) break;
+                if ( ! java.util.Arrays.equals(buffer1, buffer2)) {
+                    return false;
+                }
             }
+            return true;
+        } finally {
+            in1.reset();
+            in2.reset();
         }
-        return true;
 
     }
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs