You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/26 17:23:18 UTC

svn commit: r1189267 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractAttributeMap.java

Author: struberg
Date: Wed Oct 26 15:23:17 2011
New Revision: 1189267

URL: http://svn.apache.org/viewvc?rev=1189267&view=rev
Log:
MYFACES-3368 remove broken lazy creation without locking

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractAttributeMap.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractAttributeMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractAttributeMap.java?rev=1189267&r1=1189266&r2=1189267&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractAttributeMap.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractAttributeMap.java Wed Oct 26 15:23:17 2011
@@ -37,9 +37,9 @@ import java.util.Set;
  */
 public abstract class AbstractAttributeMap<V> extends AbstractMap<String, V>
 {
-    private Set<String> _keySet;
+    private Set<String> _keySet = new KeySet();
     private Collection<V> _values;
-    private Set<Entry<String, V>> _entrySet;
+    private Set<Entry<String, V>> _entrySet = new EntrySet();;
 
     @Override
     public void clear()
@@ -85,7 +85,7 @@ public abstract class AbstractAttributeM
     @Override
     public Set<Entry<String, V>> entrySet()
     {
-        return (_entrySet != null) ? _entrySet : (_entrySet = new EntrySet());
+        return _entrySet;
     }
 
     @Override
@@ -103,7 +103,7 @@ public abstract class AbstractAttributeM
     @Override
     public Set<String> keySet()
     {
-        return (_keySet != null) ? _keySet : (_keySet = new KeySet());
+        return _keySet;
     }
 
     @Override