Author: chamikara
Date: Sun Jun 3 11:52:25 2007
New Revision: 543958
URL: http://svn.apache.org/viewvc?view=rev&rev=543958
Log:
added cleaning work to the module.shutdown method
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/pom.xml
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/core/pom.xml?view=diff&rev=543958&r1=543957&r2=543958
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/modules/core/pom.xml
(original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/modules/core/pom.xml Sun
Jun 3 11:52:25 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>${sandesha2.version}</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java?view=diff&rev=543958&r1=543957&r2=543958
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
Sun Jun 3 11:52:25 2007
@@ -46,11 +46,15 @@
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.policy.RMPolicyExtension;
import org.apache.sandesha2.policy.SandeshaPolicyBean;
+import org.apache.sandesha2.polling.PollingManager;
import org.apache.sandesha2.security.SecurityManager;
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
+import org.apache.sandesha2.workers.Invoker;
+import org.apache.sandesha2.workers.SandeshaThread;
+import org.apache.sandesha2.workers.Sender;
/**
* The Module class of Sandesha2.
@@ -268,9 +272,26 @@
public void shutdown(ConfigurationContext configurationContext) throws
AxisFault {
if(log.isDebugEnabled()) log.debug("Entry:
SandeshaModule::shutdown, " + configurationContext);
- SandeshaUtil.
- getSandeshaStorageManager(configurationContext,
configurationContext.getAxisConfiguration())
- .shutdown();
+ StorageManager storageManager = SandeshaUtil.
+ getSandeshaStorageManager(configurationContext,
configurationContext.getAxisConfiguration());
+
+ if (storageManager!=null) {
+ SandeshaThread sender = storageManager.getSender();
+ SandeshaThread invoker = storageManager.getInvoker();
+ SandeshaThread pollingManager =
storageManager.getPollingManager();
+
+ //stopping threads.
+ if (sender!=null)
+ sender.stopRunning();
+ if (invoker!=null)
+ invoker.stopRunning();
+ if (pollingManager!=null)
+ pollingManager.stopRunning();
+
+ //shutting down the storage manager.
+ storageManager.shutdown();
+ }
+
if(log.isDebugEnabled()) log.debug("Exit:
SandeshaModule::shutdown");
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties?view=diff&rev=543958&r1=543957&r2=543958
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
Sun Jun 3 11:52:25 2007
@@ -191,7 +191,7 @@
addressNotValid=Cannot set the address - the address value is not valid.
elementMustForSpec=Element ''{0}'' must be present for the spec ''{1}''.
-couldNotSendFaultDueToException="Could not send the fault ''{0}'' due to the
exception " ''{1}'';
+couldNotSendFaultDueToException=Could not send the fault ''{0}'' due to the
exception ''{1}'';
#-------------------------------------
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
