JBoss hornetq SVN: r8917 - in trunk: tests/src/org/hornetq/tests/integration/stomp and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-08 05:02:39 -0500 (Mon, 08 Mar 2010)
New Revision: 8917
Modified:
trunk/src/main/org/hornetq/core/protocol/stomp/Stomp.java
trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0
* fix typo for Subscribe's durable-subscriber-name header
Modified: trunk/src/main/org/hornetq/core/protocol/stomp/Stomp.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/stomp/Stomp.java 2010-03-08 09:49:01 UTC (rev 8916)
+++ trunk/src/main/org/hornetq/core/protocol/stomp/Stomp.java 2010-03-08 10:02:39 UTC (rev 8917)
@@ -131,7 +131,7 @@
String SELECTOR = "selector";
- String DURABLE_SUBSCRIPTION_NAME = "durable-subscription-name";
+ String DURABLE_SUBSCRIBER_NAME = "durable-subscriber-name";
String NO_LOCAL = "no-local";
Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-03-08 09:49:01 UTC (rev 8916)
+++ trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-03-08 10:02:39 UTC (rev 8917)
@@ -257,7 +257,7 @@
String selector = (String)headers.get(Stomp.Headers.Subscribe.SELECTOR);
String ack = (String)headers.get(Stomp.Headers.Subscribe.ACK_MODE);
String id = (String)headers.get(Stomp.Headers.Subscribe.ID);
- String durableSubscriptionName = (String)headers.get(Stomp.Headers.Subscribe.DURABLE_SUBSCRIPTION_NAME);
+ String durableSubscriptionName = (String)headers.get(Stomp.Headers.Subscribe.DURABLE_SUBSCRIBER_NAME);
boolean noLocal = false;
if (headers.containsKey(Stomp.Headers.Subscribe.NO_LOCAL))
{
Modified: trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-03-08 09:49:01 UTC (rev 8916)
+++ trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-03-08 10:02:39 UTC (rev 8917)
@@ -1235,7 +1235,7 @@
String subscribeFrame =
"SUBSCRIBE\n" +
"destination:" + getTopicPrefix() + getTopicName() + "\n" +
- "durable-subscription-name: " + getName() + "\n" +
+ "durable-subscriber-name: " + getName() + "\n" +
"\n\n" +
Stomp.NULL;
sendFrame(subscribeFrame);
@@ -1295,7 +1295,7 @@
"SUBSCRIBE\n" +
"destination:" + getTopicPrefix() + getTopicName() + "\n" +
"receipt: 12\n" +
- "durable-subscription-name: " + getName() + "\n" +
+ "durable-subscriber-name: " + getName() + "\n" +
"\n\n" +
Stomp.NULL;
sendFrame(subscribeFrame);
14 years, 2 months
JBoss hornetq SVN: r8916 - in trunk: tests/src/org/hornetq/tests/unit/jms/client and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-08 04:49:01 -0500 (Mon, 08 Mar 2010)
New Revision: 8916
Modified:
trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java
trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java
Log:
fix JMS StreamMessage implementation
Modified: trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java 2010-03-05 09:29:14 UTC (rev 8915)
+++ trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java 2010-03-08 09:49:01 UTC (rev 8916)
@@ -130,6 +130,7 @@
public byte readByte() throws JMSException
{
checkRead();
+ int index = getBuffer().readerIndex();
try
{
byte type = getBuffer().readByte();
@@ -148,6 +149,11 @@
{
throw new MessageEOFException("");
}
+ catch (NumberFormatException e)
+ {
+ getBuffer().readerIndex(index);
+ throw e;
+ }
}
public short readShort() throws JMSException
@@ -493,10 +499,6 @@
public void writeObject(final Object value) throws JMSException
{
- if (value == null)
- {
- throw new NullPointerException("Attempt to write a null value");
- }
if (value instanceof String)
{
writeString((String)value);
@@ -537,6 +539,10 @@
{
writeChar((Character)value);
}
+ else if (value == null)
+ {
+ writeString(null);
+ }
else
{
throw new MessageFormatException("Invalid object type: " + value.getClass());
Modified: trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java 2010-03-05 09:29:14 UTC (rev 8915)
+++ trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java 2010-03-08 09:49:01 UTC (rev 8916)
@@ -340,7 +340,24 @@
Assert.assertEquals(value, message.readChar());
}
+
+ public void testReadCharFromNull() throws Exception
+ {
+ HornetQStreamMessage message = new HornetQStreamMessage();
+ message.writeString(null);
+ message.reset();
+
+ try
+ {
+ message.readChar();
+ fail();
+ }
+ catch (MessageFormatException e)
+ {
+ }
+ }
+
public void testReadLongFromByte() throws Exception
{
byte value = RandomUtil.randomByte();
@@ -550,6 +567,27 @@
Assert.assertEquals(Byte.toString(value), message.readString());
}
+ public void testString() throws Exception
+ {
+ String value = RandomUtil.randomString();
+ HornetQStreamMessage message = new HornetQStreamMessage();
+
+ message.writeString(value);
+ message.reset();
+
+ try
+ {
+ message.readByte();
+ fail("must throw a NumberFormatException");
+ }
+ catch (NumberFormatException e)
+ {
+ }
+
+ // we can read the String without resetting the message
+ Assert.assertEquals(value, message.readString());
+ }
+
public void testReadStringFromShort() throws Exception
{
short value = RandomUtil.randomShort();
@@ -754,14 +792,7 @@
{
HornetQStreamMessage message = new HornetQStreamMessage();
- try
- {
- message.writeObject(null);
- Assert.fail("NullPointerException");
- }
- catch (NullPointerException e)
- {
- }
+ message.writeObject(null);
}
public void testWriteObjectWithInvalidType() throws Exception
14 years, 2 months
JBoss hornetq SVN: r8915 - trunk/tests/src/org/hornetq/tests/integration/client.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-05 04:29:14 -0500 (Fri, 05 Mar 2010)
New Revision: 8915
Modified:
trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java
Log:
fix testCreateConsumerWithInvalidFilter
* a single identifier is a valid filter (if it holds a boolean value).
use another invalid filter
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java 2010-03-04 16:05:00 UTC (rev 8914)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java 2010-03-05 09:29:14 UTC (rev 8915)
@@ -114,7 +114,7 @@
clientSession.createQueue(queueName, queueName, false);
try
{
- clientSession.createConsumer(queueName, "foobar");
+ clientSession.createConsumer(queueName, "this is not valid filter");
Assert.fail("should throw exception");
}
catch (HornetQException e)
14 years, 2 months
JBoss hornetq SVN: r8914 - trunk/src/main/org/hornetq/core/filter/impl.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-04 11:05:00 -0500 (Thu, 04 Mar 2010)
New Revision: 8914
Modified:
trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java
Log:
remove sysout call
Modified: trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2010-03-04 15:31:34 UTC (rev 8913)
+++ trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2010-03-04 16:05:00 UTC (rev 8914)
@@ -155,7 +155,6 @@
else if (resultType.equals(Operator.class))
{
Operator op = (Operator) result;
- System.out.println(result);
return (Boolean)op.apply();
} else
{
14 years, 2 months
JBoss hornetq SVN: r8913 - in trunk: tests/src/org/hornetq/tests/unit/core/filter/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-04 10:31:34 -0500 (Thu, 04 Mar 2010)
New Revision: 8913
Modified:
trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java
trunk/src/main/org/hornetq/core/filter/impl/Operator.java
trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java
trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java
Log:
fix message filter
* allow an identifier as a valid message filter
* does not treat a property which is not set as a match failure (false) with LIKE AND NOT IN,
return null instead
Modified: trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2010-03-04 11:44:07 UTC (rev 8912)
+++ trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2010-03-04 15:31:34 UTC (rev 8913)
@@ -64,10 +64,12 @@
private final Map<SimpleString, Identifier> identifiers = new HashMap<SimpleString, Identifier>();
- private final Operator operator;
-
private final FilterParser parser = new FilterParser();
+ private final Object result;
+
+ private final Class<? extends Object> resultType;
+
// Static ---------------------------------------------------------
/**
@@ -103,7 +105,10 @@
try
{
- operator = (Operator)parser.parse(sfilterString, identifiers);
+
+ result = parser.parse(sfilterString, identifiers);
+ resultType = result.getClass();
+
}
catch (Throwable e)
{
@@ -145,11 +150,17 @@
}
- // Compute the result of this operator
-
- boolean res = (Boolean)operator.apply();
-
- return res;
+ if (resultType.equals(Identifier.class))
+ return (Boolean)((Identifier)result).getValue();
+ else if (resultType.equals(Operator.class))
+ {
+ Operator op = (Operator) result;
+ System.out.println(result);
+ return (Boolean)op.apply();
+ } else
+ {
+ throw new Exception("Bad object type: " + result);
+ }
}
catch (Exception e)
{
Modified: trunk/src/main/org/hornetq/core/filter/impl/Operator.java
===================================================================
--- trunk/src/main/org/hornetq/core/filter/impl/Operator.java 2010-03-04 11:44:07 UTC (rev 8912)
+++ trunk/src/main/org/hornetq/core/filter/impl/Operator.java 2010-03-04 15:31:34 UTC (rev 8913)
@@ -911,7 +911,7 @@
if (arg1 == null)
{
- return Boolean.FALSE;
+ return null;
}
if (class1 != Operator.SIMPLE_STRING)
@@ -1002,7 +1002,7 @@
computeArgument1();
if (arg1 == null)
{
- return true;
+ return null;
}
if (class1 != Operator.SIMPLE_STRING)
{
Modified: trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java 2010-03-04 11:44:07 UTC (rev 8912)
+++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java 2010-03-04 15:31:34 UTC (rev 8913)
@@ -59,9 +59,6 @@
public void testInvalidString() throws Exception
{
- testInvalidFilter("invalid");
- testInvalidFilter(new SimpleString("invalid"));
-
testInvalidFilter("color = 'red");
testInvalidFilter(new SimpleString("color = 'red"));
@@ -161,6 +158,13 @@
testBoolean("MyBoolean", true);
}
+ public void testIdentifier() throws Exception
+ {
+ filter = FilterImpl.createFilter(new SimpleString("MyBoolean"));
+
+ testBoolean("MyBoolean", true);
+ }
+
public void testDifferentNullString() throws Exception
{
filter = FilterImpl.createFilter(new SimpleString("prop <> 'foo'"));
@@ -227,6 +231,36 @@
}
+ public void testNOT_INWithNullProperty() throws Exception
+ {
+ filter = FilterImpl.createFilter(new SimpleString("myNullProp NOT IN ('foo','jms','test')"));
+
+ assertFalse(filter.match(message));
+
+ message.putStringProperty("myNullProp", "JMS");
+ assertTrue(filter.match(message));
+ }
+
+ public void testNOT_LIKEWithNullProperty() throws Exception
+ {
+ filter = FilterImpl.createFilter(new SimpleString("myNullProp NOT LIKE '1_3'"));
+
+ assertFalse(filter.match(message));
+
+ message.putStringProperty("myNullProp", "JMS");
+ assertTrue(filter.match(message));
+ }
+
+ public void testIS_NOT_NULLWithNullProperty() throws Exception
+ {
+ filter = FilterImpl.createFilter(new SimpleString("myNullProp IS NOT NULL"));
+
+ assertFalse(filter.match(message));
+
+ message.putStringProperty("myNullProp", "JMS");
+ assertTrue(filter.match(message));
+ }
+
public void testStringLike() throws Exception
{
// test LIKE operator with no wildcards
@@ -410,10 +444,10 @@
public void testNotLikeExpression() throws Exception
{
- // Should evaluate to true since the property MyString does not exist
+ // Should evaluate to false when the property MyString is not set
filter = FilterImpl.createFilter(new SimpleString("NOT (MyString LIKE '%')"));
- Assert.assertTrue(filter.match(message));
+ Assert.assertFalse(filter.match(message));
}
public void testStringLikePercentWildcard() throws Exception
Modified: trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java 2010-03-04 11:44:07 UTC (rev 8912)
+++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java 2010-03-04 15:31:34 UTC (rev 8913)
@@ -417,7 +417,7 @@
OperatorTest.assertSuccess(Operator.LIKE, new SimpleString("lose"), pattern, true);
OperatorTest.assertSuccess(Operator.LIKE, new SimpleString("loose"), pattern, false);
- OperatorTest.assertSuccess(Operator.LIKE, null, pattern, false);
+ OperatorTest.assertSuccess(Operator.LIKE, null, pattern, null);
}
public void test_LIKE_ESCAPE() throws Exception
@@ -426,7 +426,7 @@
SimpleString escapeChar = new SimpleString("\\");
OperatorTest.assertSuccess(Operator.LIKE_ESCAPE, new SimpleString("_foo"), pattern, escapeChar, true);
OperatorTest.assertSuccess(Operator.LIKE_ESCAPE, new SimpleString("bar"), pattern, escapeChar, false);
- OperatorTest.assertSuccess(Operator.LIKE_ESCAPE, null, pattern, escapeChar, false);
+ OperatorTest.assertSuccess(Operator.LIKE_ESCAPE, null, pattern, escapeChar, null);
OperatorTest.assertFailure(Operator.LIKE_ESCAPE,
new SimpleString("_foo"),
@@ -440,7 +440,7 @@
OperatorTest.assertSuccess(Operator.NOT_LIKE, new SimpleString("123"), pattern, false);
OperatorTest.assertSuccess(Operator.NOT_LIKE, new SimpleString("12993"), pattern, false);
OperatorTest.assertSuccess(Operator.NOT_LIKE, new SimpleString("1234"), pattern, true);
- OperatorTest.assertSuccess(Operator.NOT_LIKE, null, pattern, false);
+ OperatorTest.assertSuccess(Operator.NOT_LIKE, null, pattern, null);
}
public void test_NOT_LIKE_ESCAPE() throws Exception
@@ -449,7 +449,7 @@
SimpleString escapeChar = new SimpleString("\\");
OperatorTest.assertSuccess(Operator.NOT_LIKE_ESCAPE, new SimpleString("_foo"), pattern, escapeChar, false);
OperatorTest.assertSuccess(Operator.NOT_LIKE_ESCAPE, new SimpleString("bar"), pattern, escapeChar, true);
- OperatorTest.assertSuccess(Operator.NOT_LIKE_ESCAPE, null, pattern, escapeChar, false);
+ OperatorTest.assertSuccess(Operator.NOT_LIKE_ESCAPE, null, pattern, escapeChar, null);
OperatorTest.assertFailure(Operator.NOT_LIKE_ESCAPE,
new SimpleString("_foo"),
14 years, 2 months
JBoss hornetq SVN: r8912 - trunk/src/main/org/hornetq/ra/inflow.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-03-04 06:44:07 -0500 (Thu, 04 Mar 2010)
New Revision: 8912
Modified:
trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
Log:
Deleting temporary queues on non-durable topic subscriptions when deactivating the MDB
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-03-04 11:20:12 UTC (rev 8911)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-03-04 11:44:07 UTC (rev 8912)
@@ -56,6 +56,8 @@
*/
private final ClientSession session;
+ private ClientConsumer consumer;
+
/**
* The endpoint
*/
@@ -85,7 +87,6 @@
String selector = spec.getMessageSelector();
// Create the message consumer
- ClientConsumer consumer;
SimpleString selectorString = selector == null || selector.trim().equals("") ? null : new SimpleString(selector);
if (activation.isTopic() && spec.isSubscriptionDurable())
{
@@ -193,12 +194,32 @@
if (endpoint != null)
{
endpoint.release();
+ endpoint = null;
}
}
catch (Throwable t)
{
HornetQMessageHandler.log.debug("Error releasing endpoint " + endpoint, t);
}
+
+ try
+ {
+ consumer.close();
+ if (activation.getTopicTemporaryQueue() != null)
+ {
+ // We need to delete temporary topics when the activation is stopped or messages will build up on the server
+ SimpleString tmpQueue = activation.getTopicTemporaryQueue();
+ QueueQuery subResponse = session.queueQuery(tmpQueue);
+ if (subResponse.getConsumerCount() == 0)
+ {
+ session.deleteQueue(tmpQueue);
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ HornetQMessageHandler.log.debug("Error closing core-queue consumer", t);
+ }
try
{
14 years, 2 months
JBoss hornetq SVN: r8911 - trunk/src/main/org/hornetq/ra/inflow.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-03-04 06:20:12 -0500 (Thu, 04 Mar 2010)
New Revision: 8911
Modified:
trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
Log:
Making multiple sessions on the resource adapter to share a same core-queue on topic subscriptions
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-03-04 11:10:29 UTC (rev 8910)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-03-04 11:20:12 UTC (rev 8911)
@@ -94,6 +94,9 @@
private boolean isDeliveryTransacted;
private HornetQDestination destination;
+
+ /** The name of the temporary subscription name that all the sessions will share */
+ private SimpleString topicTemporaryQueue;
private final List<HornetQMessageHandler> handlers = new ArrayList<HornetQMessageHandler>();
@@ -216,6 +219,8 @@
return isTopic;
}
+
+
/**
* Start the activation
*
@@ -230,8 +235,24 @@
deliveryActive.set(true);
ra.getWorkManager().scheduleWork(new SetupActivation());
}
+
+ /**
+ * @return the topicTemporaryQueue
+ */
+ public SimpleString getTopicTemporaryQueue()
+ {
+ return topicTemporaryQueue;
+ }
/**
+ * @param topicTemporaryQueue the topicTemporaryQueue to set
+ */
+ public void setTopicTemporaryQueue(SimpleString topicTemporaryQueue)
+ {
+ this.topicTemporaryQueue = topicTemporaryQueue;
+ }
+
+ /**
* Stop the activation
*/
public void stop()
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-03-04 11:10:29 UTC (rev 8910)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-03-04 11:20:12 UTC (rev 8911)
@@ -146,8 +146,16 @@
SimpleString queueName;
if (activation.isTopic())
{
- queueName = new SimpleString(UUID.randomUUID().toString());
- session.createQueue(activation.getAddress(), queueName, selectorString, false);
+ if (activation.getTopicTemporaryQueue() == null)
+ {
+ queueName = new SimpleString(UUID.randomUUID().toString());
+ session.createQueue(activation.getAddress(), queueName, selectorString, false);
+ activation.setTopicTemporaryQueue(queueName);
+ }
+ else
+ {
+ queueName = activation.getTopicTemporaryQueue();
+ }
}
else
{
14 years, 2 months
JBoss hornetq SVN: r8910 - trunk/src/main/org/hornetq/ra.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-04 06:10:29 -0500 (Thu, 04 Mar 2010)
New Revision: 8910
Modified:
trunk/src/main/org/hornetq/ra/HornetQRAConnectionMetaData.java
Log:
fix RA connection metadata
* added supported JMSX properties to getJMSXPropertyNames()
Modified: trunk/src/main/org/hornetq/ra/HornetQRAConnectionMetaData.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQRAConnectionMetaData.java 2010-03-01 17:06:37 UTC (rev 8909)
+++ trunk/src/main/org/hornetq/ra/HornetQRAConnectionMetaData.java 2010-03-04 11:10:29 UTC (rev 8910)
@@ -150,7 +150,10 @@
*/
public Enumeration<Object> getJMSXPropertyNames()
{
- Vector<Object> v = new Vector<Object>();
+ Vector v = new Vector();
+ v.add("JMSXGroupID");
+ v.add("JMSXGroupSeq");
+ v.add("JMSXDeliveryCount");
return v.elements();
}
}
14 years, 2 months
JBoss hornetq SVN: r8909 - trunk/src/main/org/hornetq/jms/client.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-01 12:06:37 -0500 (Mon, 01 Mar 2010)
New Revision: 8909
Modified:
trunk/src/main/org/hornetq/jms/client/HornetQConnectionMetaData.java
Log:
fix connection metadata
* add JMSXGroupSeq to getJMSXPropertyNames()
* rename JBOSS_MESSAGING constant to HORNETQ and make it private
Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnectionMetaData.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQConnectionMetaData.java 2010-03-01 15:09:56 UTC (rev 8908)
+++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionMetaData.java 2010-03-01 17:06:37 UTC (rev 8909)
@@ -33,7 +33,7 @@
{
// Constants -----------------------------------------------------
- public static final String JBOSS_MESSAGING = "HornetQ";
+ private static final String HORNETQ = "HornetQ";
// Static --------------------------------------------------------
@@ -70,7 +70,7 @@
public String getJMSProviderName() throws JMSException
{
- return HornetQConnectionMetaData.JBOSS_MESSAGING;
+ return HornetQConnectionMetaData.HORNETQ;
}
public String getProviderVersion() throws JMSException
@@ -92,7 +92,7 @@
{
Vector v = new Vector();
v.add("JMSXGroupID");
- // v.add("JMSXGroupSeq");
+ v.add("JMSXGroupSeq");
v.add("JMSXDeliveryCount");
return v.elements();
}
14 years, 2 months
JBoss hornetq SVN: r8908 - trunk/src/main/org/hornetq/jms/client.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-01 10:09:56 -0500 (Mon, 01 Mar 2010)
New Revision: 8908
Modified:
trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java
Log:
fix send exception
* if the destination is not correct, throw a UnsupportedOperationException
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-03-01 14:00:10 UTC (rev 8907)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-03-01 15:09:56 UTC (rev 8908)
@@ -347,7 +347,7 @@
{
if (defaultDestination == null)
{
- throw new InvalidDestinationException("Destination must be specified on send with an anonymous producer");
+ throw new UnsupportedOperationException("Destination must be specified on send with an anonymous producer");
}
destination = defaultDestination;
@@ -358,7 +358,7 @@
{
if (!destination.equals(defaultDestination))
{
- throw new JMSException("Where a default destination is specified " + "for the sender and a destination is "
+ throw new UnsupportedOperationException("Where a default destination is specified " + "for the sender and a destination is "
+ "specified in the arguments to the send, "
+ "these destinations must be equal");
}
14 years, 2 months