Author: rwatler
Date: Thu Apr 8 20:35:40 2010
New Revision: 932096
URL: http://svn.apache.org/viewvc?rev=932096&view=rev
Log:
JS2-1183: ensure thread stopped before continuing with teardown
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java?rev=932096&r1=932095&r2=932096&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
Thu Apr 8 20:35:40 2010
@@ -174,11 +174,20 @@ public abstract class AbstractPageManage
Thread destroyReapingThread = nodeReapingThread;
if (destroyReapingThread != null)
{
+ // stop thread
nodeReapingThread = null;
synchronized (destroyReapingThread)
{
destroyReapingThread.notifyAll();
}
+ // wait for thread stop
+ try
+ {
+ destroyReapingThread.join(nodeReapingInterval);
+ }
+ catch (InterruptedException ie)
+ {
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
