[jboss-cvs] JBoss Messaging SVN: r3755 - in branches/Branch_Stable: src/main/org/jboss/jms/server/bridge and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 21 11:01:58 EST 2008
Author: timfox
Date: 2008-02-21 11:01:58 -0500 (Thu, 21 Feb 2008)
New Revision: 3755
Modified:
branches/Branch_Stable/src/main/org/jboss/jms/message/JBossMessage.java
branches/Branch_Stable/src/main/org/jboss/jms/server/bridge/Bridge.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTestBase.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1224
Modified: branches/Branch_Stable/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/message/JBossMessage.java 2008-02-21 15:55:22 UTC (rev 3754)
+++ branches/Branch_Stable/src/main/org/jboss/jms/message/JBossMessage.java 2008-02-21 16:01:58 UTC (rev 3755)
@@ -1087,15 +1087,7 @@
{
throw new IllegalArgumentException("The property name '" + name +
"' is reserved due to selector syntax.");
- }
-
- if (name.startsWith("JMSX") &&
- !name.equals("JMSXGroupID") &&
- !name.equals("JMSXGroupSeq") &&
- !name.equals("JMSXDeliveryCount"))
- {
- throw new JMSException("Can only set JMSXGroupId, JMSXGroupSeq, JMSXDeliveryCount");
- }
+ }
}
// Protected -----------------------------------------------------
Modified: branches/Branch_Stable/src/main/org/jboss/jms/server/bridge/Bridge.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/server/bridge/Bridge.java 2008-02-21 15:55:22 UTC (rev 3754)
+++ branches/Branch_Stable/src/main/org/jboss/jms/server/bridge/Bridge.java 2008-02-21 16:01:58 UTC (rev 3755)
@@ -1407,16 +1407,7 @@
String propName = (String)entry.getKey();
- //It's illegal (or pointless) to set properties beginning with JMSX
- //apart from JMSXGroupID, JMSXGroupSeq and JMSXDeliveryCount
- //Also there's no point in setting JMSXDeliveryCount since it will get reset
- //before the msg is received anyway
- if (!propName.startsWith("JMSX") ||
- propName.equals("JMSXGroupID") ||
- propName.equals("JMSXGroupSeq"));
- {
- msg.setObjectProperty(propName, entry.getValue());
- }
+ msg.setObjectProperty(propName, entry.getValue());
}
}
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java 2008-02-21 15:55:22 UTC (rev 3754)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java 2008-02-21 16:01:58 UTC (rev 3755)
@@ -997,8 +997,51 @@
m = cons.receive(5000);
- assertNull(m);
+ assertNull(m);
+ tm = sessSource.createTextMessage("blahmessage3");
+
+ final boolean myBool = false;
+ final byte myByte = (byte)23;
+ final double myDouble = 17625765d;
+ final float myFloat = 87127.23f;
+ final int myInt = 123;
+ final long myLong = 81728712;
+ final short myShort = (short)88;
+ final String myString = "ojweodewj";
+ final String myJMSX = "aardvark";
+
+ tm.setBooleanProperty("mybool", myBool);
+ tm.setByteProperty("mybyte", myByte);
+ tm.setDoubleProperty("mydouble", myDouble);
+ tm.setFloatProperty("myfloat", myFloat);
+ tm.setIntProperty("myint", myInt);
+ tm.setLongProperty("mylong", myLong);
+ tm.setShortProperty("myshort", myShort);
+ tm.setStringProperty("mystring", myString);
+
+ tm.setStringProperty("JMSXMyNaughtyJMSXProperty", myJMSX);
+
+ prod.send(tm);
+
+ tm = (TextMessage)cons.receive(1000);
+
+ assertNotNull(tm);
+
+ assertEquals("blahmessage3", tm.getText());
+
+ assertEquals(myBool, tm.getBooleanProperty("mybool"));
+ assertEquals(myByte, tm.getByteProperty("mybyte"));
+ assertEquals(myDouble, tm.getDoubleProperty("mydouble"));
+ assertEquals(myFloat, tm.getFloatProperty("myfloat"));
+ assertEquals(myInt, tm.getIntProperty("myint"));
+ assertEquals(myLong, tm.getLongProperty("mylong"));
+ assertEquals(myShort, tm.getShortProperty("myshort"));
+ assertEquals(myString, tm.getStringProperty("mystring"));
+ assertEquals(myJMSX, tm.getStringProperty("JMSXMyNaughtyJMSXProperty"));
+
+ m = cons.receive(5000);
+
}
finally
{
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTestBase.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTestBase.java 2008-02-21 15:55:22 UTC (rev 3754)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTestBase.java 2008-02-21 16:01:58 UTC (rev 3755)
@@ -83,6 +83,7 @@
m.setFloatProperty("floatProperty", 6);
m.setDoubleProperty("doubleProperty", 7);
m.setStringProperty("stringPoperty", "someString");
+ m.setStringProperty("JMSXNaughtyProperty", "aardvark");
}
/**
More information about the jboss-cvs-commits
mailing list