You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/01/09 04:02:58 UTC
[08/12] airavata git commit: fixing xbaya issues
fixing xbaya issues
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c6953df5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c6953df5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c6953df5
Branch: refs/heads/master
Commit: c6953df57f4cb558ee2b43824740b6b63f176473
Parents: 4dda3f3
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Mon Dec 29 11:43:41 2014 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Mon Dec 29 11:43:41 2014 -0500
----------------------------------------------------------------------
.../messaging/core/impl/RabbitMQConsumer.java | 3 +--
.../xbaya/messaging/EventDataRepository.java | 1 -
.../xbaya/ui/monitor/MonitorEventHandler.java | 19 +++++++++++--------
3 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6953df5/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQConsumer.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQConsumer.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQConsumer.java
index e9c5b82..1f13496 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQConsumer.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQConsumer.java
@@ -212,8 +212,7 @@ public class RabbitMQConsumer implements Consumer {
channel.queueDelete(details.getQueueName(), true, true);
} catch (IOException e) {
String msg = "could not un-bind queue: " + details.getQueueName() + " for exchange " + exchangeName;
- log.error(msg);
- throw new AiravataException(msg, e);
+ log.debug(msg);
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6953df5/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventDataRepository.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventDataRepository.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventDataRepository.java
index 1168925..4c163f7 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventDataRepository.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventDataRepository.java
@@ -108,7 +108,6 @@ public class EventDataRepository implements TableModel, BoundedRangeModel {
public void addEvent(EventData event) {
// no need the check for not null because second clause is evaluated only if
// not null
- System.out.println("Add event triggered");
boolean sliderMax = (this.sliderValue == this.events.size());
this.events.add(event);
http://git-wip-us.apache.org/repos/asf/airavata/blob/c6953df5/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
index d4f7eeb..2461da8 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
@@ -327,20 +327,23 @@ public class MonitorEventHandler implements ChangeListener {
// EventType type = event.getType();
String nodeID = event.getWorkflowNodeId();
Node node = graph.getNode(nodeID);
- if (event.getStatus().equals(WorkflowNodeState.INVOKED.toString())) {
- invokeNode(node);
+ if (node != null){
+ if (event.getStatus().equals(WorkflowNodeState.INVOKED.toString())) {
+ invokeNode(node);
// workflowStarted(graph, forward);
// workflowStatusUpdater.workflowStarted(event.getExperimentID());
- } else if (event.getStatus().equals(WorkflowNodeState.COMPLETED.toString())) {
- nodeFinished(node, true);
+ } else if (event.getStatus().equals(WorkflowNodeState.COMPLETED.toString())) {
+ nodeFinished(node, true);
// workflowFinished(graph, forward);
// workflowStatusUpdater.workflowFinished(event.getExperimentID());
- } else if (event.getStatus().equals(WorkflowNodeState.EXECUTING.toString())) {
- nodeStarted(node, forward);
+ } else if (event.getStatus().equals(WorkflowNodeState.EXECUTING.toString())) {
+ nodeStarted(node, forward);
// workflowNodeStatusUpdater.workflowStarted(event.getExperimentID(), event.getNodeID());
- } else {
- // Ignore the rest.
+ } else {
+ // Ignore the rest.
+ }
}
+
}
/**