Repository: stratos
Updated Branches:
  refs/heads/master 1c4533022 -> 4e99d8c0b


Fix NPE when loading persisted applications from registry


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b9591a40
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b9591a40
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b9591a40

Branch: refs/heads/master
Commit: b9591a4003faa36ff6c470b81d6bab185611eeff
Parents: 1c45330
Author: Akila Perera <[email protected]>
Authored: Tue Aug 25 09:32:23 2015 +0530
Committer: Akila Perera <[email protected]>
Committed: Tue Aug 25 09:32:23 2015 +0530

----------------------------------------------------------------------
 .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/b9591a40/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
 
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 6c4dc19..18a6956 100644
--- 
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ 
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -89,9 +89,8 @@ public class AutoscalerUtil {
             for (String appResourcePath : appResourcePaths) {
                 
applications.addApplication(getApplicationFromPath(appResourcePath));
             }
-            return applications;
         }
-        return null;
+        return applications;
     }
 
     public static Application getApplication(String appId) {

Reply via email to