Merge pull request #8 from chrissmith-mcafee/master

Unregister services when client is closed
opendxl · Sep 23, 2019 · ced5381 · ced5381
2 parents a5e6b7a + 52b43bc
commit ced5381
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/opendxl/client/DxlClient.java b/src/main/java/com/opendxl/client/DxlClient.java
@@ -325,14 +325,14 @@ public final void close() throws Exception {
 
         synchronized (this) {
             if (this.init) {
-                doDisconnectQuietly();
 
                 try {
                     this.serviceManager.close();
                 } catch (final Exception ex) {
                     logger.error("Error during close of service manager", ex);
                 }
 
+                doDisconnectQuietly();
                 doClose();
                 this.init = false;
             }

diff --git a/src/main/java/com/opendxl/client/ServiceManager.java b/src/main/java/com/opendxl/client/ServiceManager.java
@@ -295,6 +295,8 @@ private void commonOnRequest(final ServiceRegistrationHandler service, final Req
      */
     @Override
     public void close() {
+        // Unregister services
+        onDisconnect();
     }
 
     /**