You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/10/23 22:11:39 UTC
svn commit: r1401428 - in /airavata/trunk/modules:
registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/
ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/
ws-messenger/messagebroker/src/main/java/o...
Author: lahiru
Date: Tue Oct 23 20:11:39 2012
New Revision: 1401428
URL: http://svn.apache.org/viewvc?rev=1401428&view=rev
Log:
avoiding errors during ctrl-c before successful startup.
Modified:
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java?rev=1401428&r1=1401427&r2=1401428&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java Tue Oct 23 20:11:39 2012
@@ -144,5 +144,6 @@ public class RegistryService implements
@Override
public void shutDown(ConfigurationContext configurationContext, AxisService axisService) {
+
}
}
Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java?rev=1401428&r1=1401427&r2=1401428&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java Tue Oct 23 20:11:39 2012
@@ -70,12 +70,14 @@ public class MsgBoxServiceLifeCycle impl
public void shutDown(ConfigurationContext configurationcontext, AxisService axisservice) {
logger.info("Message box shutting down");
AiravataRegistry2 registry = (AiravataRegistry2) configurationcontext.getProperty(JCR_REGISTRY);
- registry.unsetMessageBoxURI();
- thread.interrupt();
- try {
- thread.join();
- } catch (InterruptedException e) {
- logger.info("Message box url update thread is interrupted");
+ if (registry != null && thread != null) {
+ registry.unsetMessageBoxURI();
+ thread.interrupt();
+ try {
+ thread.join();
+ } catch (InterruptedException e) {
+ logger.info("Message box url update thread is interrupted");
+ }
}
if (configurationcontext.getProperty(MsgBoxCommonConstants.MSGBOX_STORAGE) != null) {
MsgBoxStorage msgBoxStorage = (MsgBoxStorage) configurationcontext
Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1401428&r1=1401427&r2=1401428&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Tue Oct 23 20:11:39 2012
@@ -98,6 +98,7 @@ public class BrokerServiceLifeCycle impl
initialized = false;
AiravataRegistry2 registry = (AiravataRegistry2) configurationcontext
.getProperty(JCR_REGISTRY);
+ if(registry != null && thread != null){
registry.unsetEventingURI();
thread.interrupt();
try {
@@ -105,7 +106,7 @@ public class BrokerServiceLifeCycle impl
} catch (InterruptedException e) {
log.info("Message box url update thread is interrupted");
}
-
+ }
}
}
log.info("broker shut down");
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1401428&r1=1401427&r2=1401428&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Tue Oct 23 20:11:39 2012
@@ -385,6 +385,7 @@ public class WorkflowInterpretorSkeleton
public void shutDown(ConfigurationContext configctx, AxisService service) {
AiravataRegistry2 registry = jcrComponentRegistry.getRegistry();
URI gfacURL = (URI) configctx.getProperty(SERVICE_URL);
+ if(registry != null && thread != null){
registry.removeWorkflowInterpreterURI(gfacURL);
thread.interrupt();
try {
@@ -392,6 +393,7 @@ public class WorkflowInterpretorSkeleton
} catch (InterruptedException e) {
log.info("GFacURL update thread is interrupted");
}
+ }
if (runner != null) {
runner.shutDown();
}