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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-17 12:35:36 +0000 (Thu, 17 Jan 2008)
New Revision: 17089

Modified:
   trunk/freenet/src/freenet/io/comm/MessageFilter.java
Log:
trivial refactor and indent

Modified: trunk/freenet/src/freenet/io/comm/MessageFilter.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageFilter.java        2008-01-17 
12:34:47 UTC (rev 17088)
+++ trunk/freenet/src/freenet/io/comm/MessageFilter.java        2008-01-17 
12:35:36 UTC (rev 17089)
@@ -308,14 +308,15 @@

        public boolean anyConnectionsDropped() {
                if(_matched) return false;
-               if(_source != null && !_source.isConnected()) {
-                       onDroppedConnection(_source);
-                       return true;
+               if(_source != null) {
+                       if(!_source.isConnected()) {
+                               onDroppedConnection(_source);
+                               return true;
+                       } else if(_source.getBootID() != _oldBootID) {
+                               onRestartedConnection(_source);
+                               return true; // Counts as a disconnect.
+                       }
                }
-               if(_source != null && _source.getBootID() != _oldBootID) {
-                       onRestartedConnection(_source);
-                       return true; // Counts as a disconnect.
-               }
                if(_or != null)
                        return _or.anyConnectionsDropped();
                return false;