You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2012/01/07 10:44:58 UTC
svn commit: r1228583 - in /qpid/trunk/qpid/java:
broker/src/main/java/org/apache/qpid/server/message/
broker/src/main/java/org/apache/qpid/server/util/
broker/src/main/java/org/apache/qpid/server/virtualhost/
client/src/main/java/org/apache/qpid/client...
Author: kwall
Date: Sat Jan 7 09:44:58 2012
New Revision: 1228583
URL: http://svn.apache.org/viewvc?rev=1228583&view=rev
Log:
QPID-3715: Fix the receiving of an empty ObjectMessage (without a body)
Applied patch from Oleksandr Rudyy<or...@gmail.com>
Added:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java
- copied, changed from r1228493, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java
Removed:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java?rev=1228583&r1=1228582&r2=1228583&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java Sat Jan 7 09:44:58 2012
@@ -29,8 +29,8 @@ import org.apache.qpid.framing.abstracti
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.store.MessageMetaDataType;
import org.apache.qpid.AMQException;
-import org.apache.qpid.server.util.ByteBufferInputStream;
import org.apache.qpid.server.util.ByteBufferOutputStream;
+import org.apache.qpid.util.ByteBufferInputStream;
import java.io.*;
import java.nio.ByteBuffer;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java?rev=1228583&r1=1228582&r2=1228583&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java Sat Jan 7 09:44:58 2012
@@ -43,7 +43,7 @@ import org.apache.qpid.framing.FieldTabl
import org.apache.qpid.AMQException;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.util.ByteBufferInputStream;
+import org.apache.qpid.util.ByteBufferInputStream;
import java.io.DataInputStream;
import java.io.IOException;
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java?rev=1228583&r1=1228582&r2=1228583&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java Sat Jan 7 09:44:58 2012
@@ -29,6 +29,7 @@ import javax.jms.ObjectMessage;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.util.ClassLoadingAwareObjectInputStream;
+import org.apache.qpid.util.ByteBufferInputStream;
public class JMSObjectMessage extends AbstractJMSMessage implements ObjectMessage
{
@@ -62,26 +63,7 @@ public class JMSObjectMessage extends Ab
try
{
- ClassLoadingAwareObjectInputStream in = new ClassLoadingAwareObjectInputStream(new InputStream()
- {
-
-
- @Override
- public int read() throws IOException
- {
- return data.get();
- }
-
- @Override
- public int read(byte[] b, int off, int len) throws IOException
- {
- len = data.remaining() < len ? data.remaining() : len;
- data.get(b, off, len);
- return len;
- }
- });
-
- _readData = (Serializable) in.readObject();
+ _readData = read(data);
}
catch (IOException e)
{
@@ -93,7 +75,6 @@ public class JMSObjectMessage extends Ab
}
}
-
public void clearBody() throws JMSException
{
super.clearBody();
@@ -189,24 +170,7 @@ public class JMSObjectMessage extends Ab
final ByteBuffer data = _data.duplicate();
try
{
- ClassLoadingAwareObjectInputStream in = new ClassLoadingAwareObjectInputStream(new InputStream()
- {
- @Override
- public int read() throws IOException
- {
- return data.get();
- }
-
- @Override
- public int read(byte[] b, int off, int len) throws IOException
- {
- len = data.remaining() < len ? data.remaining() : len;
- data.get(b, off, len);
- return len;
- }
- });
-
- return (Serializable) in.readObject();
+ return read(data);
}
catch (ClassNotFoundException e)
{
@@ -224,4 +188,14 @@ public class JMSObjectMessage extends Ab
}
+ private Serializable read(final ByteBuffer data) throws IOException, ClassNotFoundException
+ {
+ Serializable result = null;
+ if (data != null && data.hasRemaining())
+ {
+ ClassLoadingAwareObjectInputStream in = new ClassLoadingAwareObjectInputStream(new ByteBufferInputStream(data));
+ result = (Serializable) in.readObject();
+ }
+ return result;
+ }
}
Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java (from r1228493, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java&r1=1228493&r2=1228583&rev=1228583&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java Sat Jan 7 09:44:58 2012
@@ -18,12 +18,15 @@
* under the License.
*
*/
-package org.apache.qpid.server.util;
+package org.apache.qpid.util;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
+/**
+ * Wraps @link {@link ByteBuffer} into {@link InputStream}
+ */
public class ByteBufferInputStream extends InputStream
{
private final ByteBuffer _buffer;
@@ -36,13 +39,20 @@ public class ByteBufferInputStream exten
@Override
public int read() throws IOException
{
- return _buffer.get() & 0xFF;
+ if (_buffer.hasRemaining())
+ {
+ return _buffer.get() & 0xFF;
+ }
+ return -1;
}
-
@Override
public int read(byte[] b, int off, int len) throws IOException
{
+ if (!_buffer.hasRemaining())
+ {
+ return -1;
+ }
if(_buffer.remaining() < len)
{
len = _buffer.remaining();
@@ -73,9 +83,7 @@ public class ByteBufferInputStream exten
@Override
public long skip(long n) throws IOException
{
-
_buffer.position(_buffer.position()+(int)n);
-
return n;
}
Added: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java?rev=1228583&view=auto
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java (added)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java Sat Jan 7 09:44:58 2012
@@ -0,0 +1,111 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.util;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+public class ByteBufferInputStreamTest extends TestCase
+{
+ private byte[] _data = {2, 1, 5, 3, 4};
+ private ByteBufferInputStream _inputStream;
+
+ public void setUp() throws Exception
+ {
+ _inputStream = new ByteBufferInputStream(ByteBuffer.wrap(_data));
+ }
+
+ public void testRead() throws IOException
+ {
+ for (int i = 0; i < _data.length; i++)
+ {
+ assertEquals("Unexpected byte at position " + i, _data[i], _inputStream.read());
+ }
+ assertEquals("EOF not reached", -1, _inputStream.read());
+ }
+
+ public void testReadByteArray() throws IOException
+ {
+ byte[] readBytes = new byte[_data.length];
+ int length = _inputStream.read(readBytes, 0, 2);
+
+ byte[] expected = new byte[_data.length];
+ System.arraycopy(_data, 0, expected, 0, 2);
+
+ assertTrue("Unexpected data", Arrays.equals(expected, readBytes));
+ assertEquals("Unexpected length", 2, length);
+
+ length = _inputStream.read(readBytes, 2, 3);
+
+ assertTrue("Unexpected data", Arrays.equals(_data, readBytes));
+ assertEquals("Unexpected length", 3, length);
+
+ length = _inputStream.read(readBytes);
+ assertEquals("EOF not reached", -1, length);
+ }
+
+ public void testSkip() throws IOException
+ {
+ _inputStream.skip(3);
+ byte[] readBytes = new byte[_data.length - 3];
+ int length = _inputStream.read(readBytes);
+
+ byte[] expected = new byte[_data.length - 3];
+ System.arraycopy(_data, 3, expected, 0, _data.length - 3);
+
+ assertTrue("Unexpected data", Arrays.equals(expected, readBytes));
+ assertEquals("Unexpected length", _data.length - 3, length);
+ }
+
+ public void testAvailable() throws IOException
+ {
+ int available = _inputStream.available();
+ assertEquals("Unexpected number of available bytes", _data.length, available);
+ byte[] readBytes = new byte[_data.length];
+ _inputStream.read(readBytes);
+ available = _inputStream.available();
+ assertEquals("Unexpected number of available bytes", 0, available);
+ }
+
+ public void testMarkReset() throws IOException
+ {
+ _inputStream.mark(0);
+ byte[] readBytes = new byte[_data.length];
+ int length = _inputStream.read(readBytes);
+ assertEquals("Unexpected length", _data.length, length);
+ assertEquals("Unexpected number of available bytes", 0, _inputStream.available());
+
+ _inputStream.reset();
+ readBytes = new byte[_data.length];
+ length = _inputStream.read(readBytes);
+ assertEquals("Unexpected length", _data.length, length);
+ assertEquals("Unexpected number of available bytes", 0, _inputStream.available());
+ }
+
+ public void testMarkSupported() throws IOException
+ {
+ assertTrue("Unexpected mark supported", _inputStream.markSupported());
+ }
+
+}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java?rev=1228583&r1=1228582&r2=1228583&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java Sat Jan 7 09:44:58 2012
@@ -138,4 +138,21 @@ public class ObjectMessageTest extends Q
assertEquals("Second read: UUIDs were not equal", sent, result);
}
+
+
+ public void testSendEmptyObjectMessage() throws JMSException
+ {
+ ObjectMessage testMessage = _session.createObjectMessage();
+ testMessage.setStringProperty("test-property", "test-value");
+ assertNotNull("Object was null", testMessage.toString());
+
+ _producer.send(testMessage);
+
+ ObjectMessage receivedMessage = (ObjectMessage) _consumer.receive(1000);
+
+ assertNotNull("Message was not received.", receivedMessage);
+ assertNull("No object was sent", receivedMessage.getObject());
+ assertEquals("Unexpected property received", "test-value", receivedMessage.getStringProperty("test-property"));
+ }
+
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org