QPID-3715: Fix the receiving of an empty ObjectMessage (without a body)

Applied patch from Oleksandr Rudyy<orudyy@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1228583 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 2 insertions, 89 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java b/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
index 5992e42fb7..9bfa0bb2fb 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
@@ -29,8 +29,8 @@ import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 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;
diff --git a/java/broker/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java b/java/broker/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java
deleted file mode 100644
index 898a667736..0000000000
--- a/java/broker/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *
- * 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.server.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-public class ByteBufferInputStream extends InputStream
-{
-    private final ByteBuffer _buffer;
-
-    public ByteBufferInputStream(ByteBuffer buffer)
-    {
-        _buffer = buffer;
-    }
-
-    @Override
-    public int read() throws IOException
-    {
-        return _buffer.get() & 0xFF;
-    }
-
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException
-    {
-        if(_buffer.remaining() < len)
-        {
-            len = _buffer.remaining();
-        }
-        _buffer.get(b, off, len);
-
-        return len;
-    }
-
-    @Override
-    public void mark(int readlimit)
-    {
-        _buffer.mark();
-    }
-
-    @Override
-    public void reset() throws IOException
-    {
-        _buffer.reset();
-    }
-
-    @Override
-    public boolean markSupported()
-    {
-        return true;
-    }
-
-    @Override
-    public long skip(long n) throws IOException
-    {
-
-        _buffer.position(_buffer.position()+(int)n);
-
-        return n;
-    }
-
-    @Override
-    public int available() throws IOException
-    {
-        return _buffer.remaining();
-    }
-}
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
index aad3547789..ce6bfe87e0 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
@@ -43,7 +43,7 @@ import org.apache.qpid.framing.FieldTable;
 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;