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 2014/09/17 19:32:04 UTC
[1/2] git commit: fixing erroneous condition
Repository: airavata
Updated Branches:
refs/heads/master d7bb14051 -> 024fc5d77
fixing erroneous condition
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5df1c048
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5df1c048
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5df1c048
Branch: refs/heads/master
Commit: 5df1c0484f1b6ca7debfb94331c62661cb58e0fc
Parents: 17e8fd3
Author: chathuriw <ka...@gmail.com>
Authored: Wed Sep 17 13:26:42 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Sep 17 13:26:42 2014 -0400
----------------------------------------------------------------------
.../application/catalog/data/impl/ComputeResourceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5df1c048/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
index 5b55556..9104e41 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
@@ -38,7 +38,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public String addComputeResource(ComputeResourceDescription description) throws AppCatalogException {
try {
- if (!description.getComputeResourceId().equals("") || !description.getComputeResourceId().equals(computeResourceModelConstants.DEFAULT_ID)){
+ if (description.getComputeResourceId().equals("") || description.getComputeResourceId().equals(computeResourceModelConstants.DEFAULT_ID)){
description.setComputeResourceId(AppCatalogUtils.getID(description.getHostName()));
}
return saveComputeResourceDescriptorData(description);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ch...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/024fc5d7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/024fc5d7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/024fc5d7
Branch: refs/heads/master
Commit: 024fc5d778b82e4e3f882d1963e4a01116dd5a42
Parents: 5df1c04 d7bb140
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Wed Sep 17 13:31:30 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Sep 17 13:31:30 2014 -0400
----------------------------------------------------------------------
.../gfac/monitor/impl/push/amqp/SimpleJobFinishConsumer.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------