You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/07 21:48:12 UTC
git commit: adding the return statement for empty case
Repository: airavata
Updated Branches:
refs/heads/master a1b5882e6 -> 2511edf47
adding the return statement for empty case
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2511edf4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2511edf4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2511edf4
Branch: refs/heads/master
Commit: 2511edf47b383e8a73f48c00d9bccba326a3ade6
Parents: a1b5882
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Mon Jul 7 15:48:02 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Mon Jul 7 15:48:02 2014 -0400
----------------------------------------------------------------------
.../airavata/api/server/handler/AiravataServerHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2511edf4/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index bd4abd8..d520190 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -1633,13 +1633,13 @@ public class AiravataServerHandler implements Airavata.Iface, Watcher {
try {
appCatalog = AppCatalogFactory.getAppCatalog();
List<ComputeResourceDescription> allComputeResourceList = appCatalog.getComputeResource().getAllComputeResourceList();
+ Map<String, String> allComputeResources = new HashMap<String, String>();
if (allComputeResourceList != null && !allComputeResourceList.isEmpty()){
- Map<String, String> allComputeResources = new HashMap<String, String>();
for (ComputeResourceDescription resourceDescription : allComputeResourceList){
allComputeResources.put(resourceDescription.getComputeResourceId(), resourceDescription.getHostName());
}
- return allComputeResources;
}
+ return allComputeResources;
} catch (AppCatalogException e) {
logger.error("Error while retrieving compute resource...", e);
AiravataSystemException exception = new AiravataSystemException();