[Thaw-dev] r9522 - trunk/apps/Thaw/src/thaw/fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-07-09 16:09:06 +0000 (Sun, 09 Jul 2006)
New Revision: 9522

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
Log:
Forgot an issue : FCPConnection called two times its observers when disconnected

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java     2006-07-09 16:06:00 UTC 
(rev 9521)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java     2006-07-09 16:09:06 UTC 
(rev 9522)
@@ -67,9 +67,10 @@
        public void disconnect() {
                try {
                    if(isConnected())
-                       socket.close();
-                   else
-                       Logger.notice(this, "Disconnect(): Already disconnected 
!");
+                           socket.close();
+                   else {
+                           Logger.info(this, "Disconnect(): Already 
disconnected.");
+                   }
                } catch(java.io.IOException e) {
                        Logger.warning(this, "Unable to close cleanly the 
connection : "+e.toString());
                }
@@ -197,9 +198,6 @@
                                                else
                                                        Logger.notice(this, 
"Disconnected");

-                                               /* Warns every observers */
-                                               disconnect();
-
                                                return null;
                                        }

@@ -220,9 +218,6 @@
                                else
                                        Logger.notice(this, "IOException. 
Disconnected.");

-                               /* Warns every observers */
-                               disconnect();
-
                                return null;
                        }
                } else {