You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/20 00:09:09 UTC

svn commit: r882352 - /myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java

Author: lu4242
Date: Thu Nov 19 23:09:08 2009
New Revision: 882352

URL: http://svn.apache.org/viewvc?rev=882352&view=rev
Log:
first check targetClass before value

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java?rev=882352&r1=882351&r2=882352&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java Thu Nov 19 23:09:08 2009
@@ -63,10 +63,12 @@
             throw new NullPointerException("facesContext can not be null");
         if (uiComponent == null)
             throw new NullPointerException("uiComponent can not be null");
-        if (value == null)
-            return "";
+
         checkTargetClass(facesContext, uiComponent, value);
 
+        if (value == null)
+            return null;
+
         for (Object enumConstant : targetClass.getEnumConstants())
         {
             if (enumConstant == value)