[seam-commits] Seam SVN: r14114 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2011-06-03 05:58:33 -0400 (Fri, 03 Jun 2011)
New Revision: 14114

Modified:
   branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Expressions.java
Log:
fixed NPE JBSEAM-4816

Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Expressions.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Expressions.java	2011-06-03 07:20:59 UTC (rev 14113)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Expressions.java	2011-06-03 09:58:33 UTC (rev 14114)
@@ -306,6 +306,12 @@
    
    private static void checkELExpression(final String expression)
    {
+	  
+      if (expression == null)
+      {
+         return;
+      }
+      
       for (int index = 0; blacklist.size() > index; index++)
       {
          if ( expression.contains(blacklist.get(index)) ) {
@@ -314,7 +320,7 @@
       }
       
       // for any case blacklist is not provided this is definitely not permitted
-      if ( expression.contains(".getClass()") )
+      if ( expression.contains(".getClass()") || expression.contains(".class()") )
       {
          throw new IllegalArgumentException("This EL expression is not allowed!");
       }