svn commit: r1159552 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java

[mgrigorov]

Author: mgrigorov
Date: Fri Aug 19 08:54:57 2011
New Revision: 1159552

URL: http://svn.apache.org/viewvc?rev=1159552&view=rev
Log:
Implement harmless optimization.


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java?rev=1159552&r1=1159551&r2=1159552&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
 Fri Aug 19 08:54:57 2011
@@ -50,9 +50,8 @@ public class ValidationError implements 
 
        private static final Map<String, Object> EMPTY_VARS = 
Collections.emptyMap();
 
-       // XXX 2.0: optimization - keys can be null by default until a key is 
added
        /** list of message keys to try against the 
<code>IErrorMessageSource</code> */
-       private final List<String> keys = new ArrayList<String>(1);
+       private List<String> keys;
 
        /** variables map to use in variable substitution */
        private Map<String, Object> vars;
@@ -80,6 +79,10 @@ public class ValidationError implements 
        {
                Args.notEmpty(key, "key");
 
+               if (keys == null)
+               {
+                       keys = new ArrayList<String>(1);
+               }
                keys.add(key);
                return this;
        }
@@ -139,13 +142,16 @@ public class ValidationError implements 
        {
                String errorMessage = null;
 
-               // try any message keys ...
-               for (String key : keys)
+               if (keys != null)
                {
-                       errorMessage = messageSource.getMessage(key);
-                       if (errorMessage != null)
+                       // try any message keys ...
+                       for (String key : keys)
                        {
-                               break;
+                               errorMessage = messageSource.getMessage(key);
+                               if (errorMessage != null)
+                               {
+                                       break;
+                               }
                        }
                }