tomee-commits mailing list archives

Repository: tomee
Updated Branches:
  refs/heads/develop 98faabfde -> 3f0d06518


Do not cache properties


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3f0d0651
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3f0d0651
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3f0d0651

Branch: refs/heads/develop
Commit: 3f0d06518fceb240d38d48f79550da96ede451e5
Parents: 98faabf
Author: AndyGee <andy.is@gmx.de>
Authored: Fri Dec 19 13:13:41 2014 +0100
Committer: AndyGee <andy.is@gmx.de>
Committed: Fri Dec 19 13:13:57 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/openejb/util/PropertyPlaceHolderHelper.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/3f0d0651/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
b/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
index 09a27a3..d1732b2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
@@ -122,12 +122,11 @@ public final class PropertyPlaceHolderHelper {
     }
 
     private static class PropertiesLookup extends StrLookup<Object> {
-        private static Properties PROPERTIES = SystemInstance.get().getProperties();
         private static final Map<String, String> ENV = System.getenv();
 
         @Override
         public synchronized String lookup(final String key) {
-            String value = PROPERTIES.getProperty(key);
+            String value = SystemInstance.get().getProperties().getProperty(key);
             if (value != null) {
                 return value;
             }
@@ -141,7 +140,7 @@ public final class PropertyPlaceHolderHelper {
         }
 
         public synchronized void reload() {
-            PROPERTIES = SystemInstance.get().getProperties();
+            //no-op
         }
     }
 }