Merge "Reorder modifiers"

[so.git] / bpmn / MSOCoreBPMN / src / main / java / org / openecomp / mso / bpmn / core / PropertyConfigurationSetup.java

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java
index b972d6a..98659d2 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/PropertyConfigurationSetup.java
@@ -176,7 +176,7 @@ public class PropertyConfigurationSetup {
         * PropertyConfiguration, just like they do when a property file is updated on
         * a real MSO system. This method will optionally wait for the new properties
         * to be loaded.  Timeout results in an IOException.
-        * @param values new properties
+        * @param properties new properties
         * @param wait maximum amount of time to wait for new properties to be loaded,
         *             in milliseconds.  A value of zero means, "Do not wait."
         * @throws IOException
@@ -217,7 +217,7 @@ public class PropertyConfigurationSetup {
                        String newTimestamp = PropertyConfiguration.getInstance().getProperties(type)
                                .get(PropertyConfiguration.TIMESTAMP_PROPERTY);
 
-                       if (newTimestamp != oldTimestamp) {
+                       if (!newTimestamp.equals(oldTimestamp)) {
                                return;
                        }