You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2013/06/12 05:36:24 UTC
git commit: ODE-994: Replaced the call to axisConfig cleanup with
specific call to cleanup the timer
Updated Branches:
refs/heads/ode-1.3.6.x ce94ea8f7 -> e25937516
ODE-994: Replaced the call to axisConfig cleanup with specific call to cleanup the timer
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/e2593751
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/e2593751
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/e2593751
Branch: refs/heads/ode-1.3.6.x
Commit: e259375169866eb2406cf9a25de4ac62e0d78e6a
Parents: ce94ea8
Author: sathwik <sa...@apache.org>
Authored: Tue Jun 11 15:07:55 2013 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Jun 12 09:04:37 2013 +0530
----------------------------------------------------------------------
.../java/org/apache/ode/axis2/BindingContextImpl.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/e2593751/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
----------------------------------------------------------------------
diff --git a/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java b/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
index b6300c6..af620f1 100644
--- a/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
+++ b/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
@@ -34,6 +34,7 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.engine.AxisConfigurator;
import org.apache.commons.collections.map.MultiKeyMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -160,7 +161,14 @@ public class BindingContextImpl implements BindingContext {
// if only this method did a good job of cleaning up after itself
_server._axisConfig.removeService(service.getName());
completeCleanup(axisService);
- _server._axisConfig.cleanup();
+
+ //ODE-994: commenting the cleanup on axisConfig as it cleansup everything on axis2 1.6
+ //_server._axisConfig.cleanup();
+ //For backward compatibility with older versions of axis2 that is below 1.6
+ AxisConfigurator configurator = _server._axisConfig.getConfigurator();
+ if(configurator != null)
+ configurator.cleanup();
+
} catch (AxisFault axisFault) {
__log.error("Couldn't destroy service " + serviceName);
}