Author: rgreig
Date: Thu Feb 8 06:36:16 2007
New Revision: 504915
URL: http://svn.apache.org/viewvc?view=rev&rev=504915
Log:
QPID-353 : Amend type of JMS destination type from byte to int
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java?view=diff&rev=504915&r1=504914&r2=504915
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
Thu Feb 8 06:36:16 2007
@@ -24,14 +24,12 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpid.client.message.JMSBytesMessage;
import org.apache.qpid.client.message.MessageConverter;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.framing.*;
import javax.jms.*;
import java.io.UnsupportedEncodingException;
-import java.util.Enumeration;
public class BasicMessageProducer extends Closeable implements
org.apache.qpid.jms.MessageProducer
{
@@ -440,7 +438,7 @@
AbstractJMSMessage message = convertToNativeMessage(origMessage);
- byte type;
+ int type;
if(destination instanceof Topic)
{
type = AMQDestination.TOPIC_TYPE;
@@ -454,7 +452,7 @@
type = AMQDestination.UNKNOWN_TYPE;
}
-
message.getJmsHeaders().setByte(CustomJMSXProperty.JMSZ_QPID_DESTTYPE.getShortStringName(),
+
message.getJmsHeaders().setInteger(CustomJMSXProperty.JMS_QPID_DESTTYPE.getShortStringName(),
type);
// AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java?view=diff&rev=504915&r1=504914&r2=504915
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
Thu Feb 8 06:36:16 2007
@@ -26,7 +26,8 @@
public enum CustomJMSXProperty
{
- JMSZ_QPID_DESTTYPE,
+ JMS_AMQP_NULL,
+ JMS_QPID_DESTTYPE,
JMSXGroupID,
JMSXGroupSeq;
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?view=diff&rev=504915&r1=504914&r2=504915
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
Thu Feb 8 06:36:16 2007
@@ -72,7 +72,7 @@
this(contentHeader, deliveryTag);
- byte type =
contentHeader.getHeaders().getByte(CustomJMSXProperty.JMSZ_QPID_DESTTYPE.getShortStringName());
+ int type =
contentHeader.getHeaders().getInteger(CustomJMSXProperty.JMS_QPID_DESTTYPE.getShortStringName());
AMQDestination dest;
