You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2017/02/26 10:35:45 UTC
[1/2] incubator-tamaya-extensions git commit: [TAMAYA-206] Removed
debugging code.
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/master dd22364a9 -> 507e21ed8
[TAMAYA-206] Removed debugging code.
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/200660cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/200660cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/200660cd
Branch: refs/heads/master
Commit: 200660cd08e5e982132a812363f6e13151a378dc
Parents: dd22364
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Sun Feb 26 11:34:36 2017 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Sun Feb 26 11:34:36 2017 +0100
----------------------------------------------------------------------
.../tamaya/events/internal/DefaultConfigChangeObserver.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/200660cd/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
index eea22fe..30005fa 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
@@ -52,19 +52,13 @@ public class DefaultConfigChangeObserver {
timer.scheduleAtFixedRate(new TimerTask() {
@Override
public void run() {
- System.out.println("*******");
if (running) {
- System.out.println("Observer l�uft!");
checkConfigurationUpdate();
- } else {
- System.out.println("Observer l�uft nicht.");
}
-
}
}, START_DELAY, checkPeriod);
}
-
public void checkConfigurationUpdate() {
LOG.finest("Checking configuration for changes...");
FrozenConfiguration frozenConfig = FrozenConfiguration.of(ConfigurationProvider.getConfiguration());
[2/2] incubator-tamaya-extensions git commit: [TAMAYA-243] Improved
code layout.
Posted by pl...@apache.org.
[TAMAYA-243] Improved code layout.
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/507e21ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/507e21ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/507e21ed
Branch: refs/heads/master
Commit: 507e21ed8212d733144f5275cca9392c95080244
Parents: 200660c
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Sun Feb 26 11:35:22 2017 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Sun Feb 26 11:35:22 2017 +0100
----------------------------------------------------------------------
.../tamaya/events/internal/DefaultConfigChangeObserver.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/507e21ed/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
index 30005fa..e87a748 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/internal/DefaultConfigChangeObserver.java
@@ -63,12 +63,13 @@ public class DefaultConfigChangeObserver {
LOG.finest("Checking configuration for changes...");
FrozenConfiguration frozenConfig = FrozenConfiguration.of(ConfigurationProvider.getConfiguration());
ConfigurationChange changes;
- if(lastConfig==null){
+
+ if (lastConfig == null) {
changes = ConfigurationChangeBuilder.of().putAll(frozenConfig.getProperties())
- .build();
- }else{
+ .build();
+ } else {
changes = ConfigurationChangeBuilder.of(lastConfig).addChanges(frozenConfig)
- .build();
+ .build();
}
lastConfig = frozenConfig;