You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2017/02/19 01:50:06 UTC
[49/51] [abbrv] geronimo-yoko git commit: Arrive at phaser only after
acceptor is shut down and closed
Arrive at phaser only after acceptor is shut down and closed
Project: http://git-wip-us.apache.org/repos/asf/geronimo-yoko/repo
Commit: http://git-wip-us.apache.org/repos/asf/geronimo-yoko/commit/cca05ce4
Tree: http://git-wip-us.apache.org/repos/asf/geronimo-yoko/tree/cca05ce4
Diff: http://git-wip-us.apache.org/repos/asf/geronimo-yoko/diff/cca05ce4
Branch: refs/heads/master
Commit: cca05ce419d983d9ac13c5458b4be331f4f00024
Parents: 4a9d9e5
Author: David Jencks <dj...@apache.org>
Authored: Thu Aug 11 15:42:03 2016 -0700
Committer: David Jencks <dj...@apache.org>
Committed: Thu Aug 11 15:42:03 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geronimo-yoko/blob/cca05ce4/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 4701484..ec4cebf 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
@@ -65,6 +65,7 @@ final class GIOPServerStarterThreaded extends GIOPServerStarter {
// Close the acceptor
//
acceptor_.close();
+ orbInstance_.getServerPhaser().arriveAndDeregister();
}
}
@@ -174,7 +175,7 @@ final class GIOPServerStarterThreaded extends GIOPServerStarter {
//
// Run method for starter thread
//
- public void starterRun() {
+ private void starterRun() {
while (true) {
//
// Get new transport, blocking
@@ -247,7 +248,6 @@ final class GIOPServerStarterThreaded extends GIOPServerStarter {
if (state_ == StateClosed) {
logger.fine("Shutting down server thread");
- orbInstance_.getServerPhaser().arrive();
break;
}
}