[GEOT-4394] ContentEntry used in ContentDataStore is not thread-safe,…

… patch by Jan De Moerloose
geotools · Feb 24, 2013 · defe3e7 · defe3e7
1 parent 36656cb
commit defe3e7
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/modules/library/data/src/main/java/org/geotools/data/store/ContentEntry.java b/modules/library/data/src/main/java/org/geotools/data/store/ContentEntry.java
@@ -18,6 +18,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 import org.geotools.data.FeatureEvent;
@@ -83,7 +84,7 @@ public ContentEntry(ContentDataStore dataStore, Name typeName) {
         this.typeName = typeName;
         this.dataStore = dataStore;
 
-        this.state = new HashMap<Transaction, ContentState>();
+        this.state = new ConcurrentHashMap<Transaction, ContentState>();
 
         //create a state for the auto commit transaction
         ContentState autoState = dataStore.createContentState(this);
@@ -126,13 +127,14 @@ public ContentDataStore getDataStore() {
      * @return The state for the transaction.
      */
     public ContentState getState(Transaction transaction) {
-        if (state.containsKey(transaction)) {
+        if (transaction != null && state.containsKey(transaction)) {
             return state.get(transaction);
         } else {
             ContentState auto = state.get(Transaction.AUTO_COMMIT);
             ContentState copy = (ContentState) auto.copy();
-            copy.setTransaction(transaction != null ? transaction : Transaction.AUTO_COMMIT);
-            state.put(transaction, copy);
+            Transaction t = (transaction != null ? transaction : Transaction.AUTO_COMMIT);
+            copy.setTransaction(t);
+            state.put(t, copy);
 
             return copy;
         }