close context when last connection is closed

ZDmitry · Jan 16, 2017 · 231b19e · 231b19e
1 parent 49d53d9
commit 231b19e
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/android/src/main/java/org/zeromq/rnzeromq/ReactNativeZeroMQ.java b/android/src/main/java/org/zeromq/rnzeromq/ReactNativeZeroMQ.java
@@ -46,10 +46,7 @@ void _destroy() {
             it.remove();
         }
 
-        if (_context != null) {
-            _context.term();
-            _context = null;
-        }
+        _closeContext(true);
     }
 
     @Override
@@ -104,7 +101,21 @@ private Boolean _delObject(final String uuid) {
         return false;
     }
 
+    private Boolean _closeContext(Boolean forced) {
+        if (_storage.size() == 0 || forced) {
+            if (_context != null) {
+                _context.term();
+                _context = null;
+            }
+            return true;
+        }
+        return false;
+    }
+
     private ZMQ.Socket _socket(final Integer socType) {
+        if (_context == null) {
+            _context = ZMQ.context(1);
+        }
         return _context.socket(socType);
     }
 
@@ -168,6 +179,7 @@ Object run() throws Exception {
                 socket.close();
 
                 ReactNativeZeroMQ.this._delObject(uuid);
+                ReactNativeZeroMQ.this._closeContext(false);
                 return this._successResult(true);
             }
         }).start();