commit ad04c689910d1ba041793ec5e375a716ffb5937a
author Neil Richards <ngmr@linux.vnet.ibm.com> Fri Jun 05 15:15:51 2015 +0100
committer Neil Richards <ngmr@linux.vnet.ibm.com> Fri Jun 05 15:15:51 2015 +0100
tree 3eadd62c187aa90e54e4a548bdf072c49184a494
parent ea43056fd579bf1600762fff9bdd4556e193aee6
parent 6a8f04fe3dcd7b14988e01d5b9d132583eb8d27f

Merge branch 'ibm-trunk' into ueinfo_with_downcall_locking

yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java

diff --git a/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java b/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
index fb2097c..81303b4 100644
--- a/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
+++ b/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
@@ -86,6 +86,7 @@
 
         logger.fine("GIOPServer thread started " + this + " using acceptor " + acceptor); 
         try {
+            orbInstance_.getServerPhaser().register();
             //
             // Retrieve the thread group for the servers
             //
@@ -254,6 +255,7 @@
 
                 if (state_ == StateClosed) {
                     logger.fine("Shutting down server thread"); 
+                    orbInstance_.getServerPhaser().arrive();
                     break;
                 }
             }