You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mc...@apache.org on 2011/11/07 10:09:48 UTC

svn commit: r1198656 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java

Author: mcucchiara
Date: Mon Nov  7 09:09:47 2011
New Revision: 1198656

URL: http://svn.apache.org/viewvc?rev=1198656&view=rev
Log:
OGNL-38 - Test CONSTANT.equals(variable).

Modified:
    commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java

Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java?rev=1198656&r1=1198655&r2=1198656&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java Mon Nov  7 09:09:47 2011
@@ -247,7 +247,7 @@ public class ExpressionCompiler
      */
     public String getClassName( Class<?> clazz )
     {
-        if ( clazz.getName().equals( "java.util.AbstractList$Itr" ) )
+        if ( "java.util.AbstractList$Itr".equals( clazz.getName() ) )
         {
             return Iterator.class.getName();
         }
@@ -410,7 +410,7 @@ public class ExpressionCompiler
      */
     public Class<?> getInterfaceClass( Class<?> clazz )
     {
-        if ( clazz.getName().equals( "java.util.AbstractList$Itr" ) )
+        if ( "java.util.AbstractList$Itr".equals( clazz.getName() ) )
         {
             return Iterator.class;
         }
@@ -616,7 +616,7 @@ public class ExpressionCompiler
             post = post + ")";
         }
 
-        String rootExpr = !getterCode.equals( "null" ) ? getRootExpression( expression, root, context ) : "";
+        String rootExpr = !"null".equals( getterCode ) ? getRootExpression( expression, root, context ) : "";
 
         String noRoot = (String) context.remove( "_noRoot" );
         if ( noRoot != null )