Prep 1.4.5

belgattitude · May 29, 2017 · aaef4ab · aaef4ab
1 parent 05059bc
commit aaef4ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.4.5 (2017-05-29)
+
+## Fixed
+
+- Fix call to `PjbProxyClient::getInstance()->destroy()` in favour of `PjbProxyClient::unregisterIntance()`. 
+
 ## 1.4.4 (2017-05-28)
 
 ## Fixed

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/Pjb62Driver.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/Pjb62Driver.php
@@ -105,7 +105,7 @@ public function instanciate($class_name, ...$args)
         try {
             $java = new Java($class_name, ...$args);
         } catch (Pjb62BrokenConnectionException $e) {
-            PjbProxyClient::getInstance()->destroy();
+            PjbProxyClient::unregisterInstance();
             throw new BrokenConnectionException($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -147,7 +147,7 @@ public function invoke(Interfaces\JavaType $javaObject = null, $method, array $a
         try {
             return $this->pjbProxyClient->invokeMethod($javaObject, $method, $args);
         } catch (Pjb62BrokenConnectionException $e) {
-            PjbProxyClient::getInstance()->destroy();
+            PjbProxyClient::unregisterInstance();
             throw new BrokenConnectionException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -164,7 +164,7 @@ public function getContext()
         try {
             return $this->pjbProxyClient->getClient()->getContext();
         } catch (Pjb62BrokenConnectionException $e) {
-            PjbProxyClient::getInstance()->destroy();
+            PjbProxyClient::unregisterInstance();
             throw new BrokenConnectionException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -191,7 +191,7 @@ public function getJavaSession(array $args = [])
         try {
             return $this->pjbProxyClient->getClient()->getSession();
         } catch (Pjb62BrokenConnectionException $e) {
-            PjbProxyClient::getInstance()->destroy();
+            PjbProxyClient::unregisterInstance();
             throw new BrokenConnectionException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -216,7 +216,7 @@ public function isInstanceOf(Interfaces\JavaObject $javaObject, $className)
         try {
             return $this->pjbProxyClient->isInstanceOf($javaObject, $className);
         } catch (Pjb62BrokenConnectionException $e) {
-            PjbProxyClient::getInstance()->destroy();
+            PjbProxyClient::unregisterInstance();
             throw new BrokenConnectionException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -229,7 +229,7 @@ public function values(Interfaces\JavaObject $javaObject)
         try {
             return $this->pjbProxyClient->getValues($javaObject);
         } catch (Pjb62BrokenConnectionException $e) {
-            PjbProxyClient::getInstance()->destroy();
+            PjbProxyClient::unregisterInstance();
             throw new BrokenConnectionException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -343,7 +343,7 @@ public function getClassName(Interfaces\JavaObject $javaObject)
         try {
             $inspect = $this->inspect($javaObject);
         } catch (Pjb62BrokenConnectionException $e) {
-            PjbProxyClient::getInstance()->destroy();
+            PjbProxyClient::unregisterInstance();
             throw new BrokenConnectionException($e->getMessage(), $e->getCode(), $e);
         }