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/27 20:10:02 UTC

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

Author: struberg
Date: Thu Oct 27 18:10:01 2011
New Revision: 1189904

URL: http://svn.apache.org/viewvc?rev=1189904&view=rev
Log:
MYFACES-3377 replace utterly ugly ?: construct with standard lazy init pattern

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=1189904&r1=1189903&r2=1189904&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 Thu Oct 27 18:10:01 2011
@@ -103,7 +103,11 @@ public abstract class AbstractAttributeM
     @Override
     public Set<String> keySet()
     {
-        return (_keySet != null) ? _keySet : (_keySet = new KeySet());
+        if (_keySet == null)
+        {
+            _keySet = new KeySet();
+        }
+        return _keySet;
     }
 
     @Override
@@ -147,7 +151,11 @@ public abstract class AbstractAttributeM
     @Override
     public Collection<V> values()
     {
-        return (_values != null) ? _values : (_values = new Values());
+        if (_values == null)
+        {
+            _values = new Values();
+        }
+        return _values;
     }
 
     abstract protected V getAttribute(String key);
@@ -225,7 +233,8 @@ public abstract class AbstractAttributeM
 
         public E next()
         {
-            return getValue(_currentKey = _e.nextElement());
+            _currentKey = _e.nextElement();
+            return getValue(_currentKey);
         }
 
         protected abstract E getValue(String attributeName);