[freenet-cvs] r12795 - trunk/freenet/src/freenet/io/comm

[t...@freenetproject.org]

Author: toad
Date: 2007-04-18 19:56:42 +0000 (Wed, 18 Apr 2007)
New Revision: 12795

Modified:
   trunk/freenet/src/freenet/io/comm/Message.java
Log:
Oops

Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java      2007-04-18 19:45:16 UTC 
(rev 12794)
+++ trunk/freenet/src/freenet/io/comm/Message.java      2007-04-18 19:56:42 UTC 
(rev 12795)
@@ -76,14 +76,15 @@
                    }
                    if(mayHaveSubMessages) {
                        while(true) {
-                               int size = dis.readUnsignedShort();
-                               byte[] buf = new byte[size];
+                               DataInputStream dis2;
                                try {
+                                       int size = dis.readUnsignedShort();
+                                       byte[] buf = new byte[size];
                                        dis.readFully(buf);
+                                       dis2 = new DataInputStream(new 
ByteArrayInputStream(buf));
                                } catch (EOFException e) {
                                        return m;
                                }
-                               DataInputStream dis2 = new DataInputStream(new 
ByteArrayInputStream(buf));
                                try {
                                        Message subMessage = 
decodeMessage(dis2, peer, 0, false, true);
                                        if(subMessage == null) return m;