[aries-rsa] branch master updated: ARIES-1851 - Avoid NoClassDefFoundError ZooTrace

[cs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git


The following commit(s) were added to refs/heads/master by this push:
     new 9cdfe65  ARIES-1851 - Avoid NoClassDefFoundError ZooTrace
9cdfe65 is described below

commit 9cdfe6572ec3e7f51ed316b88ceba84c46654070
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Thu Oct 18 23:53:52 2018 +0200

    ARIES-1851 - Avoid NoClassDefFoundError ZooTrace
---
 .../main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
index 3b17f35..57a0fdc 100644
--- a/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
+++ b/discovery/zookeeper/src/main/java/org/apache/aries/rsa/discovery/zookeeper/Activator.java
@@ -22,6 +22,7 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.apache.aries.rsa.discovery.zookeeper.server.ZookeeperStarter;
+import org.apache.zookeeper.server.ZooTrace;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -43,6 +44,9 @@ public class Activator implements BundleActivator {
     }
 
     public synchronized void stop(BundleContext bc) throws Exception {
+    	// Load ZooTrace class early to avoid ClassNotFoundException on shutdown
+    	ZooTrace.getTextTraceLevel();
+    	
         zkd.stop(true);
         
         if (zkStarter != null) {