Merge branch 'ems/morphemic-rc2.0' into 'morphemic-rc2.0'

Add latest metasolver changes

See merge request !96

meta_solver/src/main/java/eu/melodic/upperware/metasolver/MetaSolverApplicationListener.java

@@ -35,13 +35,14 @@ public class MetaSolverApplicationListener implements ApplicationListener<Applic
 		
 		if (event instanceof org.springframework.context.event.ContextRefreshedEvent) {
 			log.debug("** Application Event Received : Context Refreshed");
+            metricValueMonitorBean.unsubscribe();
 			metricValueMonitorBean.subscribe();
             metricValueMonitorBean.subscribeToCommonTopics();
 		} else
         if (event instanceof org.springframework.context.event.ContextClosedEvent) {
             log.debug("** Application Event Received : Context Closed");
             metricValueMonitorBean.unsubscribe();
-            metricValueMonitorBean.subscribeToCommonTopics();
+            //metricValueMonitorBean.subscribeToCommonTopics();
         } else {
             log.trace("** Application Event Received : Other...");
         }

meta_solver/src/main/java/eu/melodic/upperware/metasolver/metricvalue/MetricValueMonitorBean.java

@@ -95,7 +95,7 @@ public class MetricValueMonitorBean implements ApplicationContextAware {
         if (properties.getPubsub() != null && properties.getPubsub().getStartupTopics() != null) {
             subscribeToTopicsList(properties.getPubsub().getStartupTopics());
         }
-        log.debug("Subscribing to topics: ok");
+        log.debug("Subscribing to STARTUP topics: ok");
     }
 
     public void subscribeToCommonTopics() {
@@ -103,7 +103,8 @@ public class MetricValueMonitorBean implements ApplicationContextAware {
             List<MetaSolverProperties.Pubsub.Topic> topicsList = properties.getPubsub().getCommonTopics();
             if (topicsList!=null && topicsList.size()>0) {
                 log.debug("Subscribing to COMMON topics: ");
-                subscribeToTopicsList(properties.getPubsub().getCommonTopics());
+                subscribeToTopicsList(topicsList);
+                log.debug("Subscribing to COMMON topics: ok");
             }
         }
     }