Commits

Anonymous committed 22141e0

added a try catch block, and if any exception occured while we are trying to determinte if we should use ognl expression
compilation, we'll default to have this feature off (highly unlikely to have exception here unless XWork configuration
is not setup properly)

git-svn-id: http://svn.opensymphony.com/svn/xwork/branches/xwork_1-2@1700e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits f172b85
  • Branches xwork_1-2

Comments (0)

Files changed (1)

src/java/com/opensymphony/xwork/util/OgnlUtil.java

      */
     static boolean isUseOgnlEnhancement() {
         if (useOgnlEnhancement == null) {
-            String value = ConfigurationManager.getConfiguration().getParameter(XWorkConstants.XWORK_USE_OGNL_ENHANCEMENT);
-            if (value != null && "true".equalsIgnoreCase(value)) {
-                useOgnlEnhancement = Boolean.TRUE;
+            try {
+                String value = ConfigurationManager.getConfiguration().getParameter(XWorkConstants.XWORK_USE_OGNL_ENHANCEMENT);
+                if (value != null && "true".equalsIgnoreCase(value)) {
+                    useOgnlEnhancement = Boolean.TRUE;
+                }
+                else {
+                    useOgnlEnhancement = Boolean.FALSE; // by default, if not specified, its turn off
+                }
             }
-            else {
-                useOgnlEnhancement = Boolean.FALSE; // by default, if not specified, its turn off
+            catch(Exception e) {
+                log.warn("Failed to get xwork parameter ["+ XWorkConstants.XWORK_USE_OGNL_ENHANCEMENT+"] assuming it's false", e);
+                useOgnlEnhancement = Boolean.FALSE;
             }
         }
         return useOgnlEnhancement.booleanValue();