tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ple...@apache.org
Subject [27/50] [abbrv] incubator-tamaya-sandbox git commit: TAMAYA-126: Removed refs to Java 8.
Date Sun, 25 Sep 2016 21:24:15 GMT
TAMAYA-126: Removed refs to Java 8.


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

Branch: refs/heads/master
Commit: 2b52e65a9570519d70f6748c58274e56d3fba335
Parents: decb12b
Author: Anatole Tresch <anatole@apache.org>
Authored: Fri Oct 30 10:22:36 2015 +0100
Committer: Anatole Tresch <anatole@apache.org>
Committed: Fri Oct 30 10:22:36 2015 +0100

----------------------------------------------------------------------
 pom.xml                                                       | 4 ----
 .../tamaya/builder/ProgrammaticConfigurationContext.java      | 7 ++++---
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/2b52e65a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 746af5e..90b07e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,10 +32,6 @@ under the License.
 
     <inceptionYear>2015</inceptionYear>
 
-    <properties>
-        <jdkVersion>1.8</jdkVersion>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.tamaya</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/2b52e65a/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
b/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
index b67d18a..b3a1c3f 100644
--- a/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
+++ b/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
@@ -35,7 +35,8 @@ import org.apache.tamaya.spisupport.PropertySourceComparator;
 import javax.annotation.Priority;
 import java.util.*;
 import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.StampedLock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Logger;
 
 /**
@@ -75,7 +76,7 @@ class ProgrammaticConfigurationContext implements ConfigurationContext {
     /**
      * Lock for internal synchronization.
      */
-    private StampedLock propertySourceLock = new StampedLock();
+    private ReadWriteLock propertySourceLock = new ReentrantReadWriteLock();
 
 
     /**
@@ -149,7 +150,7 @@ class ProgrammaticConfigurationContext implements ConfigurationContext
{
     }
 
     public void addPropertySources(PropertySource... propertySourcesToAdd) {
-        Lock writeLock = propertySourceLock.asWriteLock();
+        Lock writeLock = propertySourceLock.writeLock();
         try {
             writeLock.lock();
             List<PropertySource> provided = new ArrayList<>();


Mime
View raw message