knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject knox git commit: KNOX-1662 - Avoid GatewayTestDriver NPE on ldap stop
Date Thu, 06 Dec 2018 22:58:30 GMT
Repository: knox
Updated Branches:
  refs/heads/master 1210bfbc9 -> f6d7168c5


KNOX-1662 - Avoid GatewayTestDriver NPE on ldap stop

Signed-off-by: Kevin Risden <krisden@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/f6d7168c
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/f6d7168c
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/f6d7168c

Branch: refs/heads/master
Commit: f6d7168c5bc3f4778fdb857b5b4bf23357aa841e
Parents: 1210bfb
Author: Kevin Risden <krisden@apache.org>
Authored: Thu Dec 6 16:55:36 2018 -0500
Committer: Kevin Risden <krisden@apache.org>
Committed: Thu Dec 6 17:58:07 2018 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/knox/gateway/GatewayTestDriver.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/f6d7168c/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
----------------------------------------------------------------------
diff --git a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
index aa41bea..dae6812 100644
--- a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
+++ b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
@@ -189,7 +189,9 @@ public class GatewayTestDriver {
     }
     services.clear();
 
-    ldap.stop( true );
+    if(ldap != null) {
+      ldap.stop(true);
+    }
   }
 
   public boolean isUseGateway() {


Mime
View raw message