You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/05/22 18:28:08 UTC
svn commit: r1126047 -
/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java
Author: simonetripodi
Date: Sun May 22 16:28:07 2011
New Revision: 1126047
URL: http://svn.apache.org/viewvc?rev=1126047&view=rev
Log:
added missing {} blocks
Modified:
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java
Modified: incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java?rev=1126047&r1=1126046&r2=1126047&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java (original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/ComparisonExpression.java Sun May 22 16:28:07 2011
@@ -49,7 +49,9 @@ public abstract class ComparisonExpressi
public String toGetSourceString( OgnlContext context, Object target )
{
if ( target == null )
+ {
throw new UnsupportedCompilationException( "Current target is null, can't compile." );
+ }
try
{
@@ -57,11 +59,17 @@ public abstract class ComparisonExpressi
Object value = getValueBody( context, target );
if ( value != null && Boolean.class.isAssignableFrom( value.getClass() ) )
+ {
getterClass = Boolean.TYPE;
+ }
else if ( value != null )
+ {
getterClass = value.getClass();
+ }
else
+ {
getterClass = Boolean.TYPE;
+ }
// iterate over children to make numeric type detection work properly