add emitting client to progress event

[jFCPlib.git] / src / net / pterodactylus / fcp / highlevel / HighLevelClient.java

diff --git a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
index 5de3aa2..a347e68 100644 (file)
--- a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
@@ -106,7 +106,7 @@ public class HighLevelClient {
        private final String clientName;
 
        /** The FCP connection to the node. */
-       private FcpConnection fcpConnection;
+       private FcpConnection fcpConnection = null;
 
        /** Listeners for high-level client events. */
        private List<HighLevelClientListener> highLevelClientListeners = Collections.synchronizedList(new ArrayList<HighLevelClientListener>());
@@ -226,7 +226,7 @@ public class HighLevelClient {
         */
        private void fireProgressReceived(String identifier, HighLevelProgress highLevelProgress) {
                for (HighLevelProgressListener highLevelProgressListener: highLevelProgressListeners) {
-                       highLevelProgressListener.progressReceived(identifier, highLevelProgress);
+                       highLevelProgressListener.progressReceived(this, identifier, highLevelProgress);
                }
        }
 
@@ -518,7 +518,6 @@ public class HighLevelClient {
                        fcpConnection.close();
                }
                fcpConnection = null;
-               fireClientDisconnected(throwable);
        }
 
        /**
@@ -711,6 +710,7 @@ public class HighLevelClient {
                        }
                        cancelIdentifier(null);
                        disconnect(throwable);
+                       fireClientDisconnected(throwable);
                }
 
                /**