You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/12/09 12:30:00 UTC
svn commit: r1043898 - in /ode/branches/ode-1.3.5.x:
axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Author: vanto
Date: Thu Dec 9 11:30:00 2010
New Revision: 1043898
URL: http://svn.apache.org/viewvc?rev=1043898&view=rev
Log:
some GC tweaks for itesting.
Modified:
ode/branches/ode-1.3.5.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
ode/branches/ode-1.3.5.x/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
ode/branches/ode-1.3.5.x/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Modified: ode/branches/ode-1.3.5.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
URL: http://svn.apache.org/viewvc/ode/branches/ode-1.3.5.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java?rev=1043898&r1=1043897&r2=1043898&view=diff
==============================================================================
--- ode/branches/ode-1.3.5.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java (original)
+++ ode/branches/ode-1.3.5.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java Thu Dec 9 11:30:00 2010
@@ -220,6 +220,8 @@ public abstract class Axis2TestBase {
} else {
System.clearProperty("ode.persistence");
}
+
+ server = null;
}
protected class ODEAxis2Server extends AxisServer {
Modified: ode/branches/ode-1.3.5.x/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/ode/branches/ode-1.3.5.x/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=1043898&r1=1043897&r2=1043898&view=diff
==============================================================================
--- ode/branches/ode-1.3.5.x/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/branches/ode-1.3.5.x/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Thu Dec 9 11:30:00 2010
@@ -357,6 +357,7 @@ public class ODEServer {
try {
__log.debug("shutdown BpelConnector");
_connector.shutdown();
+ _connector = null;
} catch (Throwable t) {
__log.error("Unable to cleanup temp files.", t);
}
@@ -365,6 +366,7 @@ public class ODEServer {
__log.debug("shutting down HTTP connection manager.");
try {
httpConnectionManager.shutdown();
+ httpConnectionManager = null;
} catch(Throwable t) {
__log.error("Unable to shut down HTTP connection manager.", t);
}
@@ -373,6 +375,7 @@ public class ODEServer {
__log.debug("shutting down Idle Connection Timeout Thread.");
try {
idleConnectionTimeoutThread.shutdown();
+ idleConnectionTimeoutThread = null;
} catch(Throwable t) {
__log.error("Unable to shut down Idle Connection Timeout Thread.", t);
}
@@ -384,6 +387,8 @@ public class ODEServer {
__log.error("Unable to cleanup temp files.", t);
}
+ _executorService.shutdownNow();
+ _executorService = null;
__log.info(__msgs.msgOdeShutdownCompleted());
} finally {
Modified: ode/branches/ode-1.3.5.x/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/ode-1.3.5.x/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=1043898&r1=1043897&r2=1043898&view=diff
==============================================================================
--- ode/branches/ode-1.3.5.x/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/branches/ode-1.3.5.x/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Thu Dec 9 11:30:00 2010
@@ -144,6 +144,10 @@ public class ProcessStoreImpl implements
shutdownInternalDB(_inMemDs);
_inMemDs = null;
}
+ if (_executor != null) {
+ _executor.shutdownNow();
+ _executor = null;
+ }
}
@Override