svn commit: r1442885 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java

[lo...@apache.org]

Author: lofwyr
Date: Wed Feb  6 10:09:45 2013
New Revision: 1442885

URL: http://svn.apache.org/viewvc?rev=1442885&view=rev
Log:
slightly better program logic

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java?rev=1442885&r1=1442884&r2=1442885&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java Wed Feb  6 10:09:45 2013
@@ -25,6 +25,7 @@ import org.apache.myfaces.tobago.config.
 import org.apache.myfaces.tobago.context.Theme;
 import org.apache.myfaces.tobago.internal.util.Deprecation;
 import org.apache.myfaces.tobago.internal.util.JndiUtils;
+import org.apache.myfaces.tobago.util.FacesVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -237,20 +238,25 @@ public class TobagoConfigImpl extends To
   }
 
   public synchronized void initDefaultValidatorInfo() {
-    try {
+    if (FacesVersion.supports20()) {
       final FacesContext facesContext = FacesContext.getCurrentInstance();
       if (facesContext != null) {
-        final Application application = facesContext.getApplication();
-        final Map<String, String> map
-            = (Map<String, String>) PropertyUtils.getProperty(application, "defaultValidatorInfo");
-        if (application != null && map.size() > 0) {
-          defaultValidatorInfo = Collections.unmodifiableMap(map);
-        } else {
+        try {
+          final Application application = facesContext.getApplication();
+          final Map<String, String> map;
+          map = (Map<String, String>) PropertyUtils.getProperty(application, "defaultValidatorInfo");
+          if (application != null && map.size() > 0) {
+            defaultValidatorInfo = Collections.unmodifiableMap(map);
+          } else {
+            defaultValidatorInfo = Collections.emptyMap();
+          }
+        } catch (Exception e) {
+          // should not happen
+          LOG.error("Can't initialize default validators.", e);
           defaultValidatorInfo = Collections.emptyMap();
         }
       }
-    } catch (Exception e) {
-      LOG.info("Can't initialize default validators. (Will only work with JSF 2.0 and higher)");
+    } else {
       defaultValidatorInfo = Collections.emptyMap();
     }
   }