commit ad29519fd98c9ae80dbee57bea1d50d79f69cda6
author Deepa vaddireddy <dvaddire@partner.ciena.com> Thu Aug 10 13:14:02 2017 +0530
committer Deepa vaddireddy <dvaddire@partner.ciena.com> Thu Aug 10 01:29:52 2017 -0700
tree d9e198750586a59a5f3acad9fcd92dd847977e33
parent 8bf98e09922ffc4114ab471c116a15c2d578ee09

unit test and fix for mode switch

Change-Id: I6585adb2857a0ed16ceae605a7f763318c946136

app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java

diff --git a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java
index fbd77aa..5085ae8 100644
--- a/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java
+++ b/app/src/main/java/org/opencord/sadis/impl/SubscriberAndDeviceInformationAdapter.java
@@ -92,7 +92,7 @@
         long cacheEntryTtl = cfg.getCacheTtl().getSeconds();
 
         // Rebuild cache if needed
-        if ((url != null && url != this.url) || maximumCacheSeize != this.maxiumCacheSize ||
+        if (isurlChanged(url) || maximumCacheSeize != this.maxiumCacheSize ||
                 cacheEntryTtl != this.cacheEntryTtl) {
             this.maxiumCacheSize = maximumCacheSeize;
             this.cacheEntryTtl = cacheEntryTtl;
@@ -111,6 +111,13 @@
         }
     }
 
+    private boolean isurlChanged(String url) {
+        if (url == null && this.url == null) {
+         return false;
+        }
+        return !((url == this.url) || (url != null && url.equals(this.url)));
+    }
+
     /*
      * (non-Javadoc)
      *