3 files changed, 21 insertions, 2 deletions
diff --git a/src/main/java/org/onap/music/main/CachingUtil.java b/src/main/java/org/onap/music/main/CachingUtil.java
index 83b5158f..a4366836 100755
--- a/src/main/java/org/onap/music/main/CachingUtil.java
+++ b/src/main/java/org/onap/music/main/CachingUtil.java
@@ -21,10 +21,12 @@
  */
 package org.onap.music.main;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import javax.ws.rs.core.HttpHeaders;
@@ -67,6 +69,7 @@ public class CachingUtil implements Runnable {
     private static CacheAccess<String, String> appNameCache = JCS.getInstance("appNameCache");
     private static CacheAccess<String, Map<String, String>> musicValidateCache = JCS.getInstance("musicValidateCache");
     private static CacheAccess<String, JsonCallback> callBackCache = JCS.getInstance("callBackCache");
+    private static CacheAccess<String, List<String>> callbackNotifyList = JCS.getInstance("callbackNotifyList");
     private static Map<String, Number> userAttempts = new HashMap<>();
     private static Map<String, Calendar> lastFailedTime = new HashMap<>();
 
@@ -77,6 +80,7 @@ public class CachingUtil implements Runnable {
     }
     
     public static void updateCallBackCache(String appName, JsonCallback jsonCallBack) {
+    	logger.info("updateCallBackCache: updating cache.....");
     	callBackCache.put(appName, jsonCallBack);
     }
     
@@ -84,6 +88,15 @@ public class CachingUtil implements Runnable {
     	return callBackCache.get(appName);
     }
 
+    public static void updateCallbackNotifyList(List<String> notifyList) {
+    	logger.info("callbackNotifyList: updating cache.....");
+    	callbackNotifyList.put("callbackNotify", notifyList);
+    }
+    
+    public static List<String> getCallbackNotifyList() {
+    	return callbackNotifyList.get("callbackNotify");
+    }
+    
     public void initializeMusicCache() {
         logger.info(EELFLoggerDelegate.applicationLogger,"Initializing Music Cache...");
         musicCache.put("isInitialized", "true");
diff --git a/src/main/java/org/onap/music/main/MusicUtil.java b/src/main/java/org/onap/music/main/MusicUtil.java
index 40d19766..5b23a935 100755
--- a/src/main/java/org/onap/music/main/MusicUtil.java
+++ b/src/main/java/org/onap/music/main/MusicUtil.java
@@ -615,10 +615,10 @@ public class MusicUtil {
 		
 	}
     
-	private static void setNotifyInterval(int notifyinterval) {
+	public static void setNotifyInterval(int notifyinterval) {
 		MusicUtil.notifyinterval = notifyinterval;
 	}
-	private static void setNotifyTimeOut(int notifytimeout) {
+	public static void setNotifyTimeOut(int notifytimeout) {
 		MusicUtil.notifytimeout = notifytimeout;
 	}
 
diff --git a/src/main/java/org/onap/music/main/PropertiesListener.java b/src/main/java/org/onap/music/main/PropertiesListener.java
index 0619cd41..0ed18be2 100755
--- a/src/main/java/org/onap/music/main/PropertiesListener.java
+++ b/src/main/java/org/onap/music/main/PropertiesListener.java
@@ -122,6 +122,12 @@ public class PropertiesListener implements ServletContextListener {
                         case "cassandra.port":
                             MusicUtil.setCassandraPort(Integer.parseInt(prop.getProperty(key)));
                             break;
+                        case "notify.interval":
+                        	MusicUtil.setNotifyInterval(Integer.parseInt(prop.getProperty(key)));
+                        	break;
+                        case "notify.timeout":
+                        	MusicUtil.setNotifyTimeOut(Integer.parseInt(prop.getProperty(key)));
+                        	break;
                         default:
                             logger.error(EELFLoggerDelegate.errorLogger,
                                             "No case found for " + key);