Revision: 15690
Author: brainslog
Date: Thu Dec  9 10:46:18 2010
Log: Fixes and Improvements to Diameter Stack Lifecycle

Updates Issue 2189
Status: Fixed
Fixes issue with stack restart, no need to use workaround. Testsuite to be created (Issue #2199)
http://code.google.com/p/mobicents/source/detail?r=15690

Modified:
/trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/StackImpl.java /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerTableImpl.java

=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/StackImpl.java Tue Nov 30 01:06:43 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/StackImpl.java Thu Dec 9 10:46:18 2010
@@ -352,6 +352,12 @@
   }

   public void destroy() {
+    // Be friendly
+    if(state == StackState.STARTED) {
+ log.warn("Calling destroy() with Stack in STARTED state. Calling stop() before, please do it yourself.");
+      stop();
+    }
+
     lock.lock();
     try {
       if (peerManager != null) {
=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerTableImpl.java Fri Nov 26 03:59:43 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerTableImpl.java Thu Dec 9 10:46:18 2010
@@ -293,7 +293,14 @@
     if (concurrentFactory  != null) {
       try {
         concurrentFactory.getThreadGroup().interrupt();
-        concurrentFactory.getThreadGroup().destroy();
+        // Wait for some threads which may take longer...
+ // FIXME: Change this once we get rid of ThreadGroup and hard interrupting threads.
+        long remWaitTime = 2500;
+ while(concurrentFactory.getThreadGroup().activeCount() > 0 && remWaitTime > 0) {
+            long waitTime = 250;
+            Thread.sleep(waitTime);
+            remWaitTime -= waitTime;
+        }
       }
       catch (Exception e) {
         logger.warn("Can not stop executor");
@@ -315,6 +322,14 @@
   }

   public void destroy() {
+    if (concurrentFactory != null) {
+      try {
+        concurrentFactory.getThreadGroup().destroy();
+      }
+      catch (IllegalThreadStateException itse) {
+ logger.debug("Failure trying to destroy ThreadGroup probably due to existing active threads. Use stop() before destroy(). (nr_threads={})", concurrentFactory.getThreadGroup().activeCount());
+      }
+    }
     if (router != null) {
       router.destroy();
     }

Reply via email to