You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by mb...@apache.org on 2013/01/30 22:45:09 UTC
[1/2] git commit: final members,
cast to ConcurrentMap rather than ConcurrentHashMap
final members, cast to ConcurrentMap rather than ConcurrentHashMap
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/74ca2a5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/74ca2a5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/74ca2a5f
Branch: refs/heads/master
Commit: 74ca2a5f08880cb22d276adf6932a08656e9340a
Parents: 820924d
Author: mbenson <gu...@gmail.com>
Authored: Wed Jan 30 15:44:04 2013 -0600
Committer: mbenson <gu...@gmail.com>
Committed: Wed Jan 30 15:44:04 2013 -0600
----------------------------------------------------------------------
.../core/util/context/ContextualStorage.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/74ca2a5f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java
index af1b5ce..d842a82 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/ContextualStorage.java
@@ -28,6 +28,7 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
/**
* This Storage holds all information needed for storing
@@ -39,13 +40,13 @@ public class ContextualStorage implements Serializable
{
private static final long serialVersionUID = 1L;
- private Map<Object, ContextualInstanceInfo<?>> contextualInstances;
+ private final Map<Object, ContextualInstanceInfo<?>> contextualInstances;
- private BeanManager beanManager;
+ private final BeanManager beanManager;
- private boolean concurrent;
+ private final boolean concurrent;
- private boolean passivationCapable;
+ private final boolean passivationCapable;
/**
* @param beanManager is needed for serialisation
@@ -98,7 +99,7 @@ public class ContextualStorage implements Serializable
// locked approach
ContextualInstanceInfo<T> instanceInfo = new ContextualInstanceInfo<T>();
- ConcurrentHashMap<Object, ContextualInstanceInfo<?>> concurrentMap
+ ConcurrentMap<Object, ContextualInstanceInfo<?>> concurrentMap
= (ConcurrentHashMap<Object, ContextualInstanceInfo<?>>) contextualInstances;
ContextualInstanceInfo<T> oldInstanceInfo