Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test and Fix for http://issues.apache.org/activemq/browse/AMQ-715 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@407816 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-05-19 15:05:04 +00:00
parent bca487a2bb
commit 0fd46ce621
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
activemq-core/src/main/java/org/apache/activemq/filter/ComparisonExpression.java
View File

@ -351,7 +351,42 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
// If the the objects are not of the same type,
// try to convert up to allow the comparison.
if (lc != rc) {
if (lc == Integer.class) {
if (lc == Byte.class) {
if (rc == Short.class) {
lv = new Short(((Number) lv).shortValue());
}
else if (rc == Integer.class) {
lv = new Integer(((Number) lv).intValue());
}
else if (rc == Long.class) {
lv = new Long(((Number) lv).longValue());
}
else if (rc == Float.class) {
lv = new Float(((Number) lv).floatValue());
}
else if (rc == Double.class) {
lv = new Double(((Number) lv).doubleValue());
}
else {
return Boolean.FALSE;
}
} else if (lc == Short.class) {
if (rc == Integer.class) {
lv = new Integer(((Number) lv).intValue());
}
else if (rc == Long.class) {
lv = new Long(((Number) lv).longValue());
}
else if (rc == Float.class) {
lv = new Float(((Number) lv).floatValue());
}
else if (rc == Double.class) {
lv = new Double(((Number) lv).doubleValue());
}
else {
return Boolean.FALSE;
}
} else if (lc == Integer.class) {
if (rc == Long.class) {
lv = new Long(((Number) lv).longValue());
}

33
activemq-core/src/test/java/org/apache/activemq/selector/SelectorTest.java
View File

@ -78,8 +78,33 @@ public class SelectorTest extends TestCase {
assertSelector(message, "rank > 100", true);
assertSelector(message, "rank >= 123", true);
assertSelector(message, "rank >= 124", false);
}
public void testPropertyTypes() throws Exception {
Message message = createMessage();
assertSelector(message, "byteProp = 123", true);
assertSelector(message, "byteProp = 10", false);
assertSelector(message, "shortProp = 123", true);
assertSelector(message, "shortProp = 10", false);
assertSelector(message, "shortProp = 123", true);
assertSelector(message, "shortProp = 10", false);
assertSelector(message, "intProp = 123", true);
assertSelector(message, "intProp = 10", false);
assertSelector(message, "longProp = 123", true);
assertSelector(message, "longProp = 10", false);
assertSelector(message, "floatProp = 123", true);
assertSelector(message, "floatProp = 10", false);
assertSelector(message, "doubleProp = 123", true);
assertSelector(message, "doubleProp = 10", false);
}
public void testAndSelectors() throws Exception {
Message message = createMessage();
@ -297,6 +322,14 @@ public class SelectorTest extends TestCase {
message.setJMSMessageID("connection:1:1:1:1");
message.setObjectProperty("name", "James");
message.setObjectProperty("location", "London");
message.setByteProperty("byteProp", (byte)123);
message.setShortProperty("shortProp", (short)123);
message.setIntProperty("intProp", (int)123);
message.setLongProperty("longProp", (long)123);
message.setFloatProperty("floatProp", (float)123);
message.setDoubleProperty("doubleProp", (double)123);
message.setIntProperty("rank", 123);
message.setIntProperty("version", 2);
message.setStringProperty("quote", "'In God We Trust'");