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 2011/11/23 15:57:45 UTC
svn commit: r1205422 - in /incubator/airavata/trunk/modules:
commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/
ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/
ws-messenger/messagebroker/src/main/java/org/a...
Author: lahiru
Date: Wed Nov 23 14:57:43 2011
New Revision: 1205422
URL: http://svn.apache.org/viewvc?rev=1205422&view=rev
Log:
fixng findbug issues.
Modified:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/RunTimeStatistics.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/DeleteAction.java
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java?rev=1205422&r1=1205421&r2=1205422&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java Wed Nov 23 14:57:43 2011
@@ -462,7 +462,7 @@ public class JCRRegistry extends Observa
}
}
} catch (Exception e) {
- new ServiceDescriptionRetrieveException(e);
+ throw new ServiceDescriptionRetrieveException(e);
} finally {
closeSession(session);
}
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java?rev=1205422&r1=1205421&r2=1205422&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/StoreMessageHandler.java Wed Nov 23 14:57:43 2011
@@ -93,12 +93,12 @@ public class StoreMessageHandler extends
if (addPhase == null) {
logger.error("unable to locate addressing phase object");
}
-
- if (msgContext.getCurrentPhaseIndex() + 1 == addPhase.getHandlerCount()) {
- if (msgContext.getAxisService() == null || msgContext.getAxisOperation() == null)
- AddressingFaultsHelper.triggerActionNotSupportedFault(msgContext, msgContext.getWSAAction());
+ if (msgContext != null) {
+ if (msgContext.getCurrentPhaseIndex() + 1 == addPhase.getHandlerCount()) {
+ if (msgContext.getAxisService() == null || msgContext.getAxisOperation() == null)
+ AddressingFaultsHelper.triggerActionNotSupportedFault(msgContext, msgContext.getWSAAction());
+ }
}
-
}
private Phase getAddressingPhase(MessageContext context) {
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java?rev=1205422&r1=1205421&r2=1205422&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/handler/PublishedMessageHandler.java Wed Nov 23 14:57:43 2011
@@ -108,10 +108,11 @@ public class PublishedMessageHandler ext
if (addPhase == null) {
logger.error("unable to locate addressing phase object");
}
-
- if (msgContext.getCurrentPhaseIndex() + 1 == addPhase.getHandlerCount()) {
- if (msgContext.getAxisService() == null || msgContext.getAxisOperation() == null)
- AddressingFaultsHelper.triggerActionNotSupportedFault(msgContext, msgContext.getWSAAction());
+ if (msgContext != null) {
+ if (msgContext.getCurrentPhaseIndex() + 1 == addPhase.getHandlerCount()) {
+ if (msgContext.getAxisService() == null || msgContext.getAxisOperation() == null)
+ AddressingFaultsHelper.triggerActionNotSupportedFault(msgContext, msgContext.getWSAAction());
+ }
}
}
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/RunTimeStatistics.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/RunTimeStatistics.java?rev=1205422&r1=1205421&r2=1205422&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/RunTimeStatistics.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/RunTimeStatistics.java Wed Nov 23 14:57:43 2011
@@ -46,7 +46,7 @@ public class RunTimeStatistics {
public static long maxSuccessfulDeliveryTime = 0;
public static long minFailedDeliveryTime = Long.MAX_VALUE;
public static long maxFailedDeliveryTime = 0;
- public static HashMap<String, Integer> failConsumerList = new HashMap<String, Integer>();
+ public static final HashMap<String, Integer> failConsumerList = new HashMap<String, Integer>();
// public static TreeSet currentBlackList=new TreeSet();
// public static TreeSet previousBlackList=new TreeSet();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java?rev=1205422&r1=1205421&r2=1205422&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java Wed Nov 23 14:57:43 2011
@@ -32,6 +32,7 @@ import javax.swing.JOptionPane;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.XBayaVersion;
import org.apache.airavata.xbaya.graph.ControlPort;
@@ -106,18 +107,12 @@ public abstract class GraphImpl implemen
/**
* @see org.apache.airavata.xbaya.graph.Graph#getID()
*/
- public String getID() {
+ public String gtID() throws XBayaException{
if (this.id == null) {
- // No other choice but to prompt
- // the user to pick an id
- final XBayaEngine engine = XBayaEngine.getInstance();
-// JOptionPane.showMessageDialog(engine.getGUI().getFrame(), "Provide a relatively unique workflow name",
-// "Workflow Name", JOptionPane.OK_OPTION);
- engine.getWorkflowPropertyWindow().show();
this.id = this.name;
// If its still null
if (null == this.id) {
- throw new XBayaRuntimeException("The workflow ID is null");
+ throw new XBayaException("The workflow ID is null");
}
}
return this.id;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java?rev=1205422&r1=1205421&r2=1205422&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java Wed Nov 23 14:57:43 2011
@@ -105,12 +105,14 @@ public class NotificationHandler extends
URI myWorkflowID = null;
URI myServiceID = URI.create(XBayaConstants.APPLICATION_SHORT_NAME);
String userDN = this.builder.getUserIdentifier();
- if (userDN != null || userDN.trim().length() == 0) {
- String serviceIDAsString = XBayaConstants.APPLICATION_SHORT_NAME + ":" + userDN.trim();
- try {
- myServiceID = new URI(null, null, serviceIDAsString, null);
- } catch (URISyntaxException e) {
- logger.error(e.getMessage(), e);
+ if (userDN != null) {
+ if (userDN.trim().length() == 0) {
+ String serviceIDAsString = XBayaConstants.APPLICATION_SHORT_NAME + ":" + userDN.trim();
+ try {
+ myServiceID = new URI(null, null, serviceIDAsString, null);
+ } catch (URISyntaxException e) {
+ logger.error(e.getMessage(), e);
+ }
}
}
String myNodeID = null;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java?rev=1205422&r1=1205421&r2=1205422&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEWSDLTransformer.java Wed Nov 23 14:57:43 2011
@@ -417,7 +417,7 @@ public class ODEWSDLTransformer {
uri = new URI(ODEEprEndingWithPort + "/ode/processes/"
+ StringUtil.convertToJavaIdentifier(workflowName));
} catch (URISyntaxException e) {
- new RuntimeException(e);
+ throw new RuntimeException(e);
}
address.setAttributeValue("location", uri.toString());
} else {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/DeleteAction.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/DeleteAction.java?rev=1205422&r1=1205421&r2=1205422&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/DeleteAction.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/menu/DeleteAction.java Wed Nov 23 14:57:43 2011
@@ -22,7 +22,7 @@
package org.apache.airavata.xbaya.registrybrowser.menu;
public class DeleteAction extends AbstractBrowserActionItem {
- public static String ID = "action.delete";
+ public static final String ID = "action.delete";
public DeleteAction() {
setCaption(getDefaultCaption());