svn commit: r1156307 - in /axis/axis2/java/core/branches/1_6: ./ modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java

[veithen]

Author: veithen
Date: Wed Aug 10 18:43:32 2011
New Revision: 1156307

URL: http://svn.apache.org/viewvc?rev=1156307&view=rev
Log:
AXIS2-4263: Merged r1156305 to the 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 10 18:43:32 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072296,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072296,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484,1156305

Modified: 
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java?rev=1156307&r1=1156306&r2=1156307&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
 Wed Aug 10 18:43:32 2011
@@ -49,6 +49,8 @@ public class ScriptModule implements Mod
 
     static String defaultEncoding = new 
OutputStreamWriter(System.out).getEncoding();
 
+    private ScriptDeploymentEngine deploymentEngine;
+    
     /**
      * Init by creating and deploying AxisServices for each script
      */
@@ -61,7 +63,7 @@ public class ScriptModule implements Mod
             log.error("AxisConfiguration getRepository returns null, cannot 
deploy scripts");
         } else {
             File scriptServicesDirectory = 
getScriptServicesDirectory(axisConfig);
-            ScriptDeploymentEngine deploymentEngine = new 
ScriptDeploymentEngine(axisConfig);
+            deploymentEngine = new ScriptDeploymentEngine(axisConfig);
             deploymentEngine.loadRepository(scriptServicesDirectory);
             deploymentEngine.loadServices();
         }
@@ -104,6 +106,9 @@ public class ScriptModule implements Mod
     }
 
     public void shutdown(ConfigurationContext configurationContext) throws 
AxisFault {
+        if (deploymentEngine != null) {
+            deploymentEngine.cleanup();
+        }
     }
 
 }