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

[rob...@freenetproject.org]

Author: robert
Date: 2008-01-16 22:29:58 +0000 (Wed, 16 Jan 2008)
New Revision: 17083

Modified:
   trunk/freenet/src/freenet/io/comm/MessageCore.java
Log:
readability


Modified: trunk/freenet/src/freenet/io/comm/MessageCore.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageCore.java  2008-01-16 22:13:28 UTC 
(rev 17082)
+++ trunk/freenet/src/freenet/io/comm/MessageCore.java  2008-01-16 22:29:58 UTC 
(rev 17083)
@@ -423,13 +423,12 @@
                        synchronized (filter) {
                                try {
                                        // Precaution against filter getting 
matched between being added to _filters and
-                                       // here - bug discovered by Mason
-                                   boolean fmatched = false;
-                                   while(!(fmatched = (filter.matched() || 
(filter.droppedConnection() != null)))) {
-                                       long wait = 
filter.getTimeout()-System.currentTimeMillis();
-                                       if(wait > 0)
-                                           filter.wait(wait);
-                                       else break;
+                                       // here - bug discovered by Mason, 
locking fixed up by Robert.
+                                   while(!(filter.matched() || 
(filter.droppedConnection() != null))) {
+                                               long wait = 
filter.getTimeout()-System.currentTimeMillis();
+                                               if(wait < 0)
+                                                       break;
+                                               filter.wait(wait);
                                        }
                                    if(filter.droppedConnection() != null)
                                        throw new DisconnectedException();