svn commit: r1436940 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java

[lukaszlenart]

Author: lukaszlenart
Date: Tue Jan 22 14:13:07 2013
New Revision: 1436940

URL: http://svn.apache.org/viewvc?rev=1436940&view=rev
Log:
WW-3845 improves code to avoid empty HashSet

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=1436940&r1=1436939&r2=1436940&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
 Tue Jan 22 14:13:07 2013
@@ -1243,7 +1243,6 @@ public abstract class UIBean extends Com
         Set<String> standardAttributes = standardAttributesMap.get(clz);
         if (standardAttributes == null) {
             standardAttributes = new HashSet<String>();
-            standardAttributesMap.put(clz, standardAttributes);
             while (clz != null) {
                 for (Field f : clz.getDeclaredFields()) {
                     if (Modifier.isProtected(f.getModifiers())
@@ -1257,6 +1256,7 @@ public abstract class UIBean extends Com
                     clz = clz.getSuperclass();
                 }
             }
+            standardAttributesMap.put(clz, standardAttributes);
         }
                return standardAttributes;
        }