Author: arnaudsimon
Date: Fri Aug 24 08:59:22 2007
New Revision: 569431
URL: http://svn.apache.org/viewvc?rev=569431&view=rev
Log:
updated afterReceive
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java?rev=569431&r1=569430&r2=569431&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
Fri Aug 24 08:59:22 2007
@@ -393,7 +393,7 @@
}
catch (InterruptedException e)
{
- // do nothing
+ throw new RuntimeException(e);
}
}
if (_incomingMessage != null)
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java?rev=569431&r1=569430&r2=569431&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
Fri Aug 24 08:59:22 2007
@@ -837,7 +837,8 @@
try
{
_dataIn = new DataInputStream(
- new ByteArrayInputStream(messageData.array(),
messageData.arrayOffset(), messageData.limit()));
+ new ByteArrayInputStream(messageData.array(),
messageData.arrayOffset() + messageData.position()
+ , messageData.remaining()));
}
catch (Exception e)
{
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java?rev=569431&r1=569430&r2=569431&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
Fri Aug 24 08:59:22 2007
@@ -594,7 +594,9 @@
{
try
{
- ByteArrayInputStream bais = new
ByteArrayInputStream(messageData.array());
+ ByteArrayInputStream bais = new
ByteArrayInputStream(messageData.array(),
+
messageData.arrayOffset() + messageData.position(),
+
messageData.remaining());
ObjectInputStream ois = new ObjectInputStream(bais);
_map = (Map<String, Object>) ois.readObject();
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java?rev=569431&r1=569430&r2=569431&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
Fri Aug 24 08:59:22 2007
@@ -153,23 +153,29 @@
public void afterMessageReceive() throws QpidException
{
super.afterMessageReceive();
- try
+ ByteBuffer messageData = getMessageData();
+ if (messageData != null)
{
- ByteArrayInputStream bais = new
ByteArrayInputStream(getMessageData().array());
- ObjectInputStream ois = new ObjectInputStream(bais);
- _object = (Serializable) ois.readObject();
- }
- catch (IOException ioe)
- {
- throw new QpidException(
- "Unexpected error during rebuild of message in
afterReceive() - " + "The Object stored in the message was not a Serializable
object.",
- null, ioe);
- }
- catch (ClassNotFoundException clnfe)
- {
- throw new QpidException(
- "Unexpected error during rebuild of message in
afterReceive() - " + "Could not find the required class in classpath.",
- null, clnfe);
+ try
+ {
+ ByteArrayInputStream bais = new
ByteArrayInputStream(messageData.array(),
+
messageData.arrayOffset() + messageData.position(),
+
messageData.remaining());
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ _object = (Serializable) ois.readObject();
+ }
+ catch (IOException ioe)
+ {
+ throw new QpidException(
+ "Unexpected error during rebuild of message in
afterReceive() - " + "The Object stored in the message was not a Serializable
object.",
+ null, ioe);
+ }
+ catch (ClassNotFoundException clnfe)
+ {
+ throw new QpidException(
+ "Unexpected error during rebuild of message in
afterReceive() - " + "Could not find the required class in classpath.",
+ null, clnfe);
+ }
}
}
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java?rev=569431&r1=569430&r2=569431&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
Fri Aug 24 08:59:22 2007
@@ -114,12 +114,13 @@
public void afterMessageReceive() throws QpidException
{
super.afterMessageReceive();
- ByteBuffer data = getMessageData();
- if (data != null)
+ ByteBuffer messageData = getMessageData();
+ if (messageData != null)
{
try
{
- _messageText = new String(data.array(), CHARACTER_ENCODING);
+ _messageText = new String(messageData.array(),
messageData.arrayOffset() + messageData.position(),
+ messageData.remaining(),
CHARACTER_ENCODING);
}
catch (UnsupportedEncodingException e)
{
