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/04/10 22:44:56 UTC
svn commit: r1311979 - in /incubator/airavata/trunk/modules:
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/inv...
Author: lahiru
Date: Tue Apr 10 20:44:56 2012
New Revision: 1311979
URL: http://svn.apache.org/viewvc?rev=1311979&view=rev
Log:
Fixing NPE during embedded mode invocations.
Modified:
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1311979&r1=1311978&r2=1311979&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Tue Apr 10 20:44:56 2012
@@ -316,7 +316,7 @@ public class GFacMessageReciever impleme
*/
private Axis2Registry getRegistry(ConfigurationContext context) {
if (this.registry == null) {
- this.registry = (Axis2Registry) context.getProperty(GFacService.CONFIGURATION_CONTEXT_REGISTRY);
+ this.registry = (Axis2Registry) ((GFacConfiguration)context.getProperty(GFacService.GFAC_CONFIGURATION)).getRegistry();
}
return registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1311979&r1=1311978&r2=1311979&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Tue Apr 10 20:44:56 2012
@@ -923,7 +923,7 @@ public class WorkflowInterpreter {
.getComponent().getWSDL()), node.getID(),
this.engine.getMonitor().getConfiguration()
.getMessageBoxURL().toASCIIString(),
- gfacURLString, this.notifier, this.topic,
+ this.engine.getMonitor().getConfiguration().getBrokerURL().toASCIIString(), this.notifier, this.topic,
this.engine.getConfiguration().getJcrComponentRegistry().getRegistry(),
portTypeQName.getLocalPart(),this.engine.getConfiguration());
} else {
@@ -941,7 +941,7 @@ public class WorkflowInterpreter {
.getComponent().getWSDL()), node.getID(),
this.configuration.getMessageBoxURL()
.toASCIIString(),
- gfacURLString, this.notifier, this.topic, configuration.getJcrComponentRegistry().getRegistry(),
+ this.configuration.getBrokerURL().toASCIIString(), this.notifier, this.topic, configuration.getJcrComponentRegistry().getRegistry(),
portTypeQName.getLocalPart(),this.configuration);
}else{
invoker = new GenericInvoker(portTypeQName,
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1311979&r1=1311978&r2=1311979&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Tue Apr 10 20:44:56 2012
@@ -199,6 +199,7 @@ public class EmbeddedGFacInvoker impleme
* @throws XBayaException
*/
public void setup() throws XBayaException {
+ this.notifier.setServiceID(this.nodeID);
}
private void setup(WsdlDefinitions definitions) throws XBayaException {