commit 64591a6efd7ad3c031237240c38fc3fd517c8ea8
author Ray Milkey <ray@onlab.us> Tue Jan 12 09:50:45 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Jan 12 18:13:02 2016 +0000
tree bfcebe950555df1cdbdfabb8affc5dc89d3b1661
parent 138de8bf40a87ee66ab8da2f4a27a34d1999485c

Fix problem with apps disappearing after cluster restart

Change-Id: I5d7d6b86677fc5deb8d576e3e5b107c8c4c763e5

core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
index fe4aa0b..8ef0d5b 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/app/GossipApplicationStore.java
@@ -198,7 +198,10 @@
                 // Directly return if app already exists
                 ApplicationId appId = getId(appName);
                 if (appId != null) {
-                    return getApplication(appId);
+                    Application application = getApplication(appId);
+                    if (application != null) {
+                        return application;
+                    }
                 }
 
                 ApplicationDescription appDesc = getApplicationDescription(appName);