dion 2004/08/20 05:04:39
Modified: jexl/src/java/org/apache/commons/jexl/parser ASTNENode.java
ASTEQNode.java
Log:
Don't create new Booleans if possible
Revision Changes Path
1.5 +7 -7
jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTNENode.java
Index: ASTNENode.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTNENode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ASTNENode.java 28 Feb 2004 13:45:20 -0000 1.4
+++ ASTNENode.java 20 Aug 2004 12:04:39 -0000 1.5
@@ -66,30 +66,30 @@
}
else if (left.getClass().equals(right.getClass()))
{
- return new Boolean(!left.equals(right));
+ return Boolean.valueOf(!left.equals(right));
}
else if(left instanceof Float || left instanceof Double ||
right instanceof Float || right instanceof Double)
{
- return new Boolean(
+ return Boolean.valueOf(
!Coercion.coerceDouble(left).equals(Coercion.coerceDouble(right)));
}
else if ( left instanceof Number || right instanceof Number ||
left instanceof Character || right instanceof Character)
{
- return new Boolean(
+ return Boolean.valueOf(
!Coercion.coerceLong(left).equals(Coercion.coerceLong(right)));
}
else if (left instanceof Boolean || right instanceof Boolean)
{
- return new Boolean(
+ return Boolean.valueOf(
!Coercion.coerceBoolean(left).equals(Coercion.coerceBoolean(right)));
}
else if (left instanceof java.lang.String || right instanceof String)
{
- return new Boolean(!left.toString().equals(right.toString()));
+ return Boolean.valueOf(!left.toString().equals(right.toString()));
}
- return new Boolean(!left.equals(right));
+ return Boolean.valueOf(!left.equals(right));
}
}
1.5 +7 -7
jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTEQNode.java
Index: ASTEQNode.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTEQNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ASTEQNode.java 28 Feb 2004 13:45:20 -0000 1.4
+++ ASTEQNode.java 20 Aug 2004 12:04:39 -0000 1.5
@@ -64,7 +64,7 @@
}
else if (left.getClass().equals(right.getClass()))
{
- return new Boolean(left.equals(right));
+ return Boolean.valueOf(left.equals(right));
}
else if(left instanceof Float || left instanceof Double ||
right instanceof Float || right instanceof Double)
@@ -72,24 +72,24 @@
Double l = Coercion.coerceDouble(left);
Double r = Coercion.coerceDouble(right);
- return new Boolean(l.equals(r));
+ return Boolean.valueOf(l.equals(r));
}
else if ( left instanceof Number || right instanceof Number ||
left instanceof Character || right instanceof Character)
{
- return new Boolean(
+ return Boolean.valueOf(
Coercion.coerceLong(left).equals(Coercion.coerceLong(right)));
}
else if (left instanceof Boolean || right instanceof Boolean)
{
- return new Boolean(
+ return Boolean.valueOf(
Coercion.coerceBoolean(left).equals(Coercion.coerceBoolean(right)));
}
else if (left instanceof java.lang.String || right instanceof String)
{
- return new Boolean(left.toString().equals(right.toString()));
+ return Boolean.valueOf(left.toString().equals(right.toString()));
}
- return new Boolean(left.equals(right));
+ return Boolean.valueOf(left.equals(right));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
