tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ple...@apache.org
Subject [3/3] incubator-tamaya-extensions git commit: [TAMAYA-232] This commits fixes the breaking change introduced by a git pull -r.
Date Fri, 24 Feb 2017 23:16:11 GMT
[TAMAYA-232] This commits fixes the breaking change introduced by a git pull -r.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/e8db5e48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/e8db5e48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/e8db5e48

Branch: refs/heads/master
Commit: e8db5e48c6398b725a23a57f42a489cb43fc76f6
Parents: c985c77
Author: Oliver B. Fischer <plexus@apache.org>
Authored: Sat Feb 25 00:15:15 2017 +0100
Committer: Oliver B. Fischer <plexus@apache.org>
Committed: Sat Feb 25 00:15:15 2017 +0100

----------------------------------------------------------------------
 .../org/apache/tamaya/events/ConfigurationChangeBuilder.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e8db5e48/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
index e622869..37232c7 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigurationChangeBuilder.java
@@ -106,12 +106,12 @@ public final class ConfigurationChangeBuilder {
                 changes.add(new PropertyChangeEvent(original, en.getKey(), val, en.getValue()));
             }
         }
-        for (Map.Entry<String, String> en : map2.getProperties().entrySet()) {
-            String val = map1.get(en.getKey());
+        for (Map.Entry<String, String> en : target.getProperties().entrySet()) {
+            String val = original.get(en.getKey());
             if (val == null) {
-                changes.add(new PropertyChangeEvent(map1, en.getKey(), null, en.getValue()));
+                changes.add(new PropertyChangeEvent(original, en.getKey(), null, en.getValue()));
             } else if (!val.equals(en.getValue())) {
-                changes.add(new PropertyChangeEvent(map1, en.getKey(), val, en.getValue()));
+                changes.add(new PropertyChangeEvent(original, en.getKey(), val, en.getValue()));
             }
         }
         return changes;


Mime
View raw message