You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/08/07 02:28:20 UTC
svn commit: r1694594 [3/5] - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ bdbs...
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java Fri Aug 7 00:28:17 2015
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class DelegatingValueWriter<V> implements ValueWriter<V>
{
@@ -33,7 +33,7 @@ public abstract class DelegatingValueWri
_registry = registry;
}
- public int writeToBuffer(final ByteBuffer buffer)
+ public int writeToBuffer(final QpidByteBuffer buffer)
{
return _delegate.writeToBuffer(buffer);
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -21,8 +21,7 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class DescribedTypeConstructor<T extends Object>
{
@@ -30,7 +29,7 @@ public abstract class DescribedTypeConst
{
return new TypeConstructor<T>()
{
- public T construct(final ByteBuffer in, final ValueHandler handler) throws AmqpErrorException
+ public T construct(final QpidByteBuffer in, final ValueHandler handler) throws AmqpErrorException
{
return DescribedTypeConstructor.this.construct(describedConstructor.construct(in, handler));
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -23,8 +23,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
import org.apache.qpid.amqp_1_0.type.transport.Error;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class DoubleTypeConstructor implements TypeConstructor
{
@@ -40,7 +39,7 @@ public class DoubleTypeConstructor imple
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=8)
{
@@ -55,4 +54,4 @@ public class DoubleTypeConstructor imple
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java Fri Aug 7 00:28:17 2015
@@ -21,14 +21,14 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class FixedEightWriter<T extends Object> implements ValueWriter<T>
{
private int _written = 9;
private long _value;
- public final int writeToBuffer(ByteBuffer buffer)
+ public final int writeToBuffer(QpidByteBuffer buffer)
{
int remaining = buffer.remaining();
int written = _written;
@@ -105,4 +105,4 @@ public abstract class FixedEightWriter<T
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java Fri Aug 7 00:28:17 2015
@@ -21,14 +21,14 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class FixedFourWriter<T extends Object> implements ValueWriter<T>
{
private int _written = 5;
private int _value;
- public final int writeToBuffer(ByteBuffer buffer)
+ public final int writeToBuffer(QpidByteBuffer buffer)
{
int remaining = buffer.remaining();
int written = _written;
@@ -119,4 +119,4 @@ public abstract class FixedFourWriter<T
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java Fri Aug 7 00:28:17 2015
@@ -19,7 +19,7 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class FixedOneWriter<T> implements ValueWriter<T>
@@ -27,7 +27,7 @@ public abstract class FixedOneWriter<T>
protected int _written = 2;
protected byte _value;
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
switch(_written)
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java Fri Aug 7 00:28:17 2015
@@ -21,7 +21,7 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class FixedSixteenWriter<T extends Object> implements ValueWriter<T>
{
@@ -29,7 +29,7 @@ public abstract class FixedSixteenWriter
private long _msb;
private long _lsb;
- public final int writeToBuffer(ByteBuffer buffer)
+ public final int writeToBuffer(QpidByteBuffer buffer)
{
int remaining = buffer.remaining();
int written = _written;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java Fri Aug 7 00:28:17 2015
@@ -21,14 +21,14 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class FixedTwoWriter <T extends Object> implements ValueWriter<T>
{
private int _written = 3;
private short _value;
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
switch(_written)
@@ -93,4 +93,4 @@ public abstract class FixedTwoWriter <T
abstract byte getFormatCode();
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -23,8 +23,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
import org.apache.qpid.amqp_1_0.type.transport.Error;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class FloatTypeConstructor implements TypeConstructor
{
@@ -40,7 +39,7 @@ public class FloatTypeConstructor implem
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=4)
{
@@ -55,4 +54,4 @@ public class FloatTypeConstructor implem
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java Fri Aug 7 00:28:17 2015
@@ -22,6 +22,7 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.framing.AMQFrame;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
@@ -33,7 +34,7 @@ public class FrameWriter implements Valu
private ValueWriter _typeWriter;
private int _size = -1;
private static final byte[] EMPTY_BYTE_ARRAY = new byte[] {};
- private ByteBuffer _payload;
+ private QpidByteBuffer _payload;
enum State
{
@@ -65,7 +66,7 @@ public class FrameWriter implements Valu
return false;
}
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
int remaining;
@@ -85,8 +86,8 @@ public class FrameWriter implements Valu
_size = _typeWriter.writeToBuffer(remaining > 8
- ? (ByteBuffer)buffer.duplicate().position(buffer.position()+8)
- : ByteBuffer.wrap(EMPTY_BYTE_ARRAY)) + 8 + payloadLength;
+ ? buffer.duplicate().position(buffer.position()+8)
+ : QpidByteBuffer.wrap(EMPTY_BYTE_ARRAY)) + 8 + payloadLength;
}
else
{
@@ -113,7 +114,7 @@ public class FrameWriter implements Valu
if(payloadLength > 0)
{
- ByteBuffer dup = _payload.slice();
+ QpidByteBuffer dup = _payload.slice();
int payloadUsed = buffer.remaining();
dup.limit(payloadUsed);
buffer.put(dup);
@@ -235,7 +236,7 @@ public class FrameWriter implements Valu
}
if(_size == -1)
{
- _size = _typeWriter.writeToBuffer(ByteBuffer.wrap(EMPTY_BYTE_ARRAY)) + 8 + (_payload == null ? 0 : _payload.remaining());
+ _size = _typeWriter.writeToBuffer(QpidByteBuffer.wrap(EMPTY_BYTE_ARRAY)) + 8 + (_payload == null ? 0 : _payload.remaining());
}
return _size;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class IntTypeConstructor implements TypeConstructor
{
@@ -39,7 +38,7 @@ public class IntTypeConstructor implemen
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=4)
{
@@ -55,4 +54,4 @@ public class IntTypeConstructor implemen
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java Fri Aug 7 00:28:17 2015
@@ -21,7 +21,7 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class IntegerWriter implements ValueWriter<Integer>
{
@@ -61,7 +61,7 @@ public class IntegerWriter implements Va
};
- public int writeToBuffer(final ByteBuffer buffer)
+ public int writeToBuffer(final QpidByteBuffer buffer)
{
return _delegate.writeToBuffer(buffer);
}
@@ -103,4 +103,4 @@ public class IntegerWriter implements Va
{
registry.register(Integer.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java Fri Aug 7 00:28:17 2015
@@ -21,9 +21,10 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
import java.util.List;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
+
public class ListWriter implements ValueWriter<List>
{
private static class NonEmptyListWriter extends AbstractListWriter<List>
@@ -92,7 +93,7 @@ public class ListWriter implements Value
}
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
return _delegate.writeToBuffer(buffer);
}
@@ -141,7 +142,7 @@ public class ListWriter implements Value
private boolean _complete;
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
if(!_complete && buffer.hasRemaining())
@@ -169,4 +170,4 @@ public class ListWriter implements Value
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class LongTypeConstructor implements TypeConstructor
{
@@ -39,7 +38,7 @@ public class LongTypeConstructor impleme
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=8)
{
@@ -55,4 +54,4 @@ public class LongTypeConstructor impleme
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java Fri Aug 7 00:28:17 2015
@@ -21,7 +21,7 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class LongWriter implements ValueWriter<Long>
{
@@ -63,7 +63,7 @@ public class LongWriter implements Value
}
};
- public int writeToBuffer(final ByteBuffer buffer)
+ public int writeToBuffer(final QpidByteBuffer buffer)
{
return _delegate.writeToBuffer(buffer);
}
@@ -108,4 +108,4 @@ public class LongWriter implements Value
registry.register(Long.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -20,8 +20,7 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
class NullTypeConstructor implements TypeConstructor<Void>
{
@@ -31,7 +30,7 @@ class NullTypeConstructor implements Typ
{
}
- public Void construct(final ByteBuffer in, final ValueHandler handler) throws AmqpErrorException
+ public Void construct(final QpidByteBuffer in, final ValueHandler handler) throws AmqpErrorException
{
return null;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java Fri Aug 7 00:28:17 2015
@@ -21,13 +21,13 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class NullWriter implements ValueWriter<Void>
{
private boolean _complete = true;
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
if(!_complete && buffer.hasRemaining())
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java Fri Aug 7 00:28:17 2015
@@ -22,9 +22,11 @@ package org.apache.qpid.amqp_1_0.codec;
import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
+
public interface ProtocolHandler
{
- ProtocolHandler parse(ByteBuffer in);
+ ProtocolHandler parse(QpidByteBuffer in);
boolean isDone();
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java Fri Aug 7 00:28:17 2015
@@ -24,6 +24,7 @@ import org.apache.qpid.amqp_1_0.framing.
import org.apache.qpid.amqp_1_0.framing.SASLProtocolHeaderHandler;
import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
@@ -55,7 +56,7 @@ public class ProtocolHeaderHandler imple
}
- public ProtocolHandler parse(final ByteBuffer in)
+ public ProtocolHandler parse(final QpidByteBuffer in)
{
if(!in.hasRemaining())
{
@@ -116,7 +117,7 @@ public class ProtocolHeaderHandler imple
}
- boolean transition(ByteBuffer in, byte expected, State next)
+ boolean transition(QpidByteBuffer in, byte expected, State next)
{
byte b = in.get();
if(b == expected)
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ShortTypeConstructor implements TypeConstructor
{
@@ -39,7 +38,7 @@ public class ShortTypeConstructor implem
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=2)
{
@@ -55,4 +54,4 @@ public class ShortTypeConstructor implem
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java Fri Aug 7 00:28:17 2015
@@ -21,7 +21,7 @@
package org.apache.qpid.amqp_1_0.codec;
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class SimpleVariableWidthWriter<V> extends VariableWidthWriter<V>
{
@@ -39,7 +39,7 @@ public abstract class SimpleVariableWidt
return _buf.length;
}
- protected void writeBytes(ByteBuffer buf, int offset, int length)
+ protected void writeBytes(QpidByteBuffer buf, int offset, int length)
{
buf.put(_buf, getOffset()+offset, length);
}
@@ -65,4 +65,4 @@ public abstract class SimpleVariableWidt
protected abstract int getOffset();
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
import org.apache.qpid.amqp_1_0.type.transport.Error;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class SmallIntConstructor implements TypeConstructor
{
@@ -39,7 +38,7 @@ public class SmallIntConstructor impleme
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.hasRemaining())
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
import org.apache.qpid.amqp_1_0.type.transport.Error;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class SmallLongConstructor implements TypeConstructor
{
@@ -39,7 +38,7 @@ public class SmallLongConstructor implem
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.hasRemaining())
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@ import org.apache.qpid.amqp_1_0.type.Amq
import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
import org.apache.qpid.amqp_1_0.type.transport.Error;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class SmallUIntConstructor implements TypeConstructor
{
@@ -39,7 +38,7 @@ public class SmallUIntConstructor implem
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.hasRemaining())
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java Fri Aug 7 00:28:17 2015
@@ -23,8 +23,7 @@ import org.apache.qpid.amqp_1_0.type.Amq
import org.apache.qpid.amqp_1_0.type.UnsignedLong;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
import org.apache.qpid.amqp_1_0.type.transport.Error;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class SmallULongConstructor implements TypeConstructor
{
@@ -40,7 +39,7 @@ public class SmallULongConstructor imple
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.hasRemaining())
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -21,6 +21,7 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
@@ -44,7 +45,7 @@ public class StringTypeConstructor exten
}
@Override
- public Object construct(final ByteBuffer in, boolean isCopy, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, boolean isCopy, ValueHandler handler) throws AmqpErrorException
{
int size;
@@ -59,7 +60,7 @@ public class StringTypeConstructor exten
int origPosition = in.position();
- ByteBuffer dup = in.duplicate();
+ QpidByteBuffer dup = in.duplicate();
try
{
dup.limit(dup.position()+size);
@@ -68,7 +69,7 @@ public class StringTypeConstructor exten
{
throw new IllegalArgumentException("position: " + dup.position() + "size: " + size + " capacity: " + dup.capacity());
}
- CharBuffer charBuf = _charSet.decode(dup);
+ CharBuffer charBuf = dup.decode(_charSet);
String str = charBuf.toString();
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java Fri Aug 7 00:28:17 2015
@@ -20,6 +20,7 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.Symbol;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
@@ -54,7 +55,7 @@ public class SymbolArrayWriter extends V
return _length;
}
- @Override protected void writeBytes(final ByteBuffer buf, final int offset, final int length)
+ @Override protected void writeBytes(final QpidByteBuffer buf, final int offset, final int length)
{
buf.put(_encodedVal,offset,length);
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentMa
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.Symbol;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class SymbolTypeConstructor extends VariableWidthTypeConstructor
{
@@ -48,7 +49,7 @@ public class SymbolTypeConstructor exten
}
@Override
- public Object construct(final ByteBuffer in, boolean isCopy, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, boolean isCopy, ValueHandler handler) throws AmqpErrorException
{
int size;
@@ -76,9 +77,9 @@ public class SymbolTypeConstructor exten
Symbol symbolVal = SYMBOL_MAP.get(binaryStr);
if(symbolVal == null)
{
- ByteBuffer dup = in.duplicate();
+ QpidByteBuffer dup = in.duplicate();
dup.limit(in.position()+size);
- CharBuffer charBuf = ASCII.decode(dup);
+ CharBuffer charBuf = dup.decode(ASCII);
symbolVal = Symbol.getSymbol(charBuf.toString());
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,8 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.Symbol;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import java.nio.ByteBuffer;
import java.nio.charset.Charset;
public class SymbolWriter extends VariableWidthWriter<Symbol>
@@ -77,7 +77,7 @@ public class SymbolWriter extends Variab
}
@Override
- protected void writeBytes(ByteBuffer buf, int offset, int length)
+ protected void writeBytes(QpidByteBuffer buf, int offset, int length)
{
int end = offset + length;
for(int i = offset; i < end; i++)
@@ -99,4 +99,4 @@ public class SymbolWriter extends Variab
{
registry.register(Symbol.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,8 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import java.nio.ByteBuffer;
import java.util.Date;
public class TimestampTypeConstructor implements TypeConstructor
@@ -40,7 +40,7 @@ public class TimestampTypeConstructor im
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=8)
{
@@ -57,4 +57,4 @@ public class TimestampTypeConstructor im
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -23,10 +23,11 @@ package org.apache.qpid.amqp_1_0.codec;
import java.nio.ByteBuffer;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public interface TypeConstructor<T>
{
- public T construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException;
+ public T construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -23,8 +23,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.Error;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class UByteTypeConstructor implements TypeConstructor
{
@@ -40,7 +39,7 @@ public class UByteTypeConstructor implem
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.hasRemaining())
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class UIntTypeConstructor implements TypeConstructor
{
@@ -39,7 +38,7 @@ public class UIntTypeConstructor impleme
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=4)
{
@@ -56,4 +55,4 @@ public class UIntTypeConstructor impleme
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ULongTypeConstructor implements TypeConstructor
{
@@ -39,7 +38,7 @@ public class ULongTypeConstructor implem
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=8)
{
@@ -58,4 +57,4 @@ public class ULongTypeConstructor implem
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -23,8 +23,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.Error;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class UShortTypeConstructor implements TypeConstructor
{
@@ -40,7 +39,7 @@ public class UShortTypeConstructor imple
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=2)
{
@@ -57,4 +56,4 @@ public class UShortTypeConstructor imple
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -23,8 +23,8 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.*;
import org.apache.qpid.amqp_1_0.type.transport.Error;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import java.nio.ByteBuffer;
import java.util.UUID;
public class UUIDTypeConstructor implements TypeConstructor
@@ -41,7 +41,7 @@ public class UUIDTypeConstructor impleme
{
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
if(in.remaining()>=16)
{
@@ -59,4 +59,4 @@ public class UUIDTypeConstructor impleme
}
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java Fri Aug 7 00:28:17 2015
@@ -22,15 +22,14 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.UnsignedByte;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class UnsignedByteWriter implements ValueWriter<UnsignedByte>
{
private int _written;
private byte _value;
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
switch(_written)
@@ -89,4 +88,4 @@ public class UnsignedByteWriter implemen
{
registry.register(UnsignedByte.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class UnsignedIntegerWriter implements ValueWriter<UnsignedInteger>
{
@@ -68,7 +67,7 @@ public class UnsignedIntegerWriter imple
private boolean _complete;
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
if(!_complete && buffer.hasRemaining())
@@ -99,7 +98,7 @@ public class UnsignedIntegerWriter imple
- public int writeToBuffer(final ByteBuffer buffer)
+ public int writeToBuffer(final QpidByteBuffer buffer)
{
return _delegate.writeToBuffer(buffer);
}
@@ -145,4 +144,4 @@ public class UnsignedIntegerWriter imple
{
registry.register(UnsignedInteger.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java Fri Aug 7 00:28:17 2015
@@ -22,8 +22,7 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class UnsignedLongWriter implements ValueWriter<UnsignedLong>
{
@@ -71,7 +70,7 @@ public class UnsignedLongWriter implemen
private boolean _complete;
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
if(!_complete && buffer.hasRemaining())
@@ -116,7 +115,7 @@ public class UnsignedLongWriter implemen
registry.register(UnsignedLong.class, FACTORY);
}
- public int writeToBuffer(final ByteBuffer buffer)
+ public int writeToBuffer(final QpidByteBuffer buffer)
{
return _delegate.writeToBuffer(buffer);
}
@@ -149,4 +148,4 @@ public class UnsignedLongWriter implemen
return false;
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java Fri Aug 7 00:28:17 2015
@@ -23,6 +23,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.transport.AmqpError;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
@@ -85,14 +86,14 @@ public class ValueHandler implements Des
_describedTypeConstructorRegistry = registry;
}
- public Object parse(final ByteBuffer in) throws AmqpErrorException
+ public Object parse(final QpidByteBuffer in) throws AmqpErrorException
{
TypeConstructor constructor = readConstructor(in);
return constructor.construct(in, this);
}
- public TypeConstructor readConstructor(ByteBuffer in) throws AmqpErrorException
+ public TypeConstructor readConstructor(QpidByteBuffer in) throws AmqpErrorException
{
if(!in.hasRemaining())
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java Fri Aug 7 00:28:17 2015
@@ -24,6 +24,8 @@ package org.apache.qpid.amqp_1_0.codec;
import java.nio.ByteBuffer;
import java.util.Map;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
+
public interface ValueWriter<T extends Object>
{
@@ -48,7 +50,7 @@ public interface ValueWriter<T extends O
}
- int writeToBuffer(ByteBuffer buffer);
+ int writeToBuffer(QpidByteBuffer buffer);
void setValue(T frameBody);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java Fri Aug 7 00:28:17 2015
@@ -21,6 +21,7 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
@@ -33,7 +34,7 @@ public abstract class VariableWidthTypeC
_size = size;
}
- public Object construct(final ByteBuffer in, ValueHandler handler) throws AmqpErrorException
+ public Object construct(final QpidByteBuffer in, ValueHandler handler) throws AmqpErrorException
{
return construct(in, false, handler);
}
@@ -43,6 +44,6 @@ public abstract class VariableWidthTypeC
return _size;
}
- public abstract Object construct(ByteBuffer in, boolean isCopy, ValueHandler handler) throws AmqpErrorException;
+ public abstract Object construct(QpidByteBuffer in, boolean isCopy, ValueHandler handler) throws AmqpErrorException;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java Fri Aug 7 00:28:17 2015
@@ -23,12 +23,14 @@ package org.apache.qpid.amqp_1_0.codec;
import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
+
public abstract class VariableWidthWriter<V> implements ValueWriter<V>
{
private int _written;
private int _size;
- public int writeToBuffer(ByteBuffer buffer)
+ public int writeToBuffer(QpidByteBuffer buffer)
{
int written = _written;
@@ -157,7 +159,7 @@ public abstract class VariableWidthWrite
protected abstract int getLength();
- protected abstract void writeBytes(ByteBuffer buf, int offset, int length);
+ protected abstract void writeBytes(QpidByteBuffer buf, int offset, int length);
public boolean isComplete()
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java Fri Aug 7 00:28:17 2015
@@ -20,8 +20,8 @@
package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.List;
@@ -33,7 +33,7 @@ class ZeroListConstructor implements Typ
{
}
- public List construct(final ByteBuffer in, final ValueHandler handler) throws AmqpErrorException
+ public List construct(final QpidByteBuffer in, final ValueHandler handler) throws AmqpErrorException
{
return Collections.EMPTY_LIST;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java Fri Aug 7 00:28:17 2015
@@ -21,8 +21,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
class ZeroUIntConstructor implements TypeConstructor<UnsignedInteger>
{
@@ -32,7 +31,7 @@ class ZeroUIntConstructor implements Typ
{
}
- public UnsignedInteger construct(final ByteBuffer in, final ValueHandler handler) throws AmqpErrorException
+ public UnsignedInteger construct(final QpidByteBuffer in, final ValueHandler handler) throws AmqpErrorException
{
return UnsignedInteger.ZERO;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java Fri Aug 7 00:28:17 2015
@@ -21,8 +21,7 @@ package org.apache.qpid.amqp_1_0.codec;
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.UnsignedLong;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
class ZeroULongConstructor implements TypeConstructor<UnsignedLong>
{
@@ -32,7 +31,7 @@ class ZeroULongConstructor implements Ty
{
}
- public UnsignedLong construct(final ByteBuffer in, final ValueHandler handler) throws AmqpErrorException
+ public UnsignedLong construct(final QpidByteBuffer in, final ValueHandler handler) throws AmqpErrorException
{
return UnsignedLong.ZERO;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java Fri Aug 7 00:28:17 2015
@@ -22,26 +22,27 @@
package org.apache.qpid.amqp_1_0.framing;
import org.apache.qpid.amqp_1_0.type.FrameBody;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
public abstract class AMQFrame<T>
{
private T _frameBody;
- private ByteBuffer _payload;
+ private QpidByteBuffer _payload;
AMQFrame(T frameBody)
{
_frameBody = frameBody;
}
- protected AMQFrame(T frameBody, ByteBuffer payload)
+ protected AMQFrame(T frameBody, QpidByteBuffer payload)
{
_frameBody = frameBody;
_payload = payload;
}
- public ByteBuffer getPayload()
+ public QpidByteBuffer getPayload()
{
return _payload;
}
@@ -51,7 +52,7 @@ public abstract class AMQFrame<T>
return createAMQFrame(channel, frameBody, null);
}
- public static TransportFrame createAMQFrame(short channel, FrameBody frameBody, ByteBuffer payload)
+ public static TransportFrame createAMQFrame(short channel, FrameBody frameBody, QpidByteBuffer payload)
{
return new TransportFrame(channel, frameBody, payload);
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java Fri Aug 7 00:28:17 2015
@@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
import org.apache.qpid.amqp_1_0.codec.ProtocolHandler;
import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class AMQPProtocolHeaderHandler implements ProtocolHandler
{
@@ -46,7 +47,7 @@ public class AMQPProtocolHeaderHandler i
_connection = connection;
}
- public ProtocolHandler parse(final ByteBuffer in)
+ public ProtocolHandler parse(final QpidByteBuffer in)
{
while(in.hasRemaining() && _state != State.ERROR)
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java Fri Aug 7 00:28:17 2015
@@ -31,6 +31,7 @@ import org.apache.qpid.amqp_1_0.type.Err
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
import org.apache.qpid.amqp_1_0.type.transport.Error;
import org.apache.qpid.amqp_1_0.type.transport.Transfer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class FrameHandler implements ProtocolHandler
{
@@ -51,7 +52,7 @@ public class FrameHandler implements Pro
private State _state = State.SIZE_0;
private int _size;
- private ByteBuffer _buffer;
+ private QpidByteBuffer _buffer;
@@ -62,14 +63,14 @@ public class FrameHandler implements Pro
}
- public ProtocolHandler parse(ByteBuffer in)
+ public ProtocolHandler parse(QpidByteBuffer in)
{
try
{
Error frameParsingError = null;
int size = _size;
State state = _state;
- ByteBuffer oldIn = null;
+ QpidByteBuffer oldIn = null;
while(in.hasRemaining() && state != State.ERROR)
{
@@ -135,7 +136,7 @@ public class FrameHandler implements Pro
if(in.remaining() < size-4)
{
- _buffer = ByteBuffer.allocateDirect(size-4);
+ _buffer = QpidByteBuffer.allocateDirect(size-4);
_buffer.put(in);
state = State.BUFFERING;
break;
@@ -150,7 +151,7 @@ public class FrameHandler implements Pro
}
else
{
- ByteBuffer dup = in.duplicate();
+ QpidByteBuffer dup = in.duplicate();
dup.limit(dup.position()+_buffer.remaining());
int i = _buffer.remaining();
int d = dup.remaining();
@@ -231,7 +232,7 @@ public class FrameHandler implements Pro
{
if(val instanceof Transfer)
{
- ByteBuffer buf = ByteBuffer.allocateDirect(in.remaining());
+ QpidByteBuffer buf = QpidByteBuffer.allocateDirect(in.remaining());
buf.put(in);
buf.flip();
((Transfer)val).setPayload(buf);
@@ -257,7 +258,6 @@ public class FrameHandler implements Pro
{
in.position(inPos);
in.limit(inLimit);
- System.err.println(toHex(in));
throw e;
}
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java Fri Aug 7 00:28:17 2015
@@ -26,6 +26,7 @@ import org.apache.qpid.amqp_1_0.type.Amq
import org.apache.qpid.amqp_1_0.type.ErrorCondition;
import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
import org.apache.qpid.amqp_1_0.type.transport.Error;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
import java.util.Formatter;
@@ -49,7 +50,7 @@ public class SASLFrameHandler implements
private State _state = State.SIZE_0;
private int _size;
- private ByteBuffer _buffer;
+ private QpidByteBuffer _buffer;
@@ -60,14 +61,14 @@ public class SASLFrameHandler implements
}
- public ProtocolHandler parse(ByteBuffer in)
+ public ProtocolHandler parse(QpidByteBuffer in)
{
try
{
Error frameParsingError = null;
int size = _size;
State state = _state;
- ByteBuffer oldIn = null;
+ QpidByteBuffer oldIn = null;
while(in.hasRemaining() && !_connection.isSASLComplete() && state != State.ERROR)
{
@@ -133,7 +134,7 @@ public class SASLFrameHandler implements
if(in.remaining() < size-4)
{
- _buffer = ByteBuffer.allocateDirect(size-4);
+ _buffer = QpidByteBuffer.allocateDirect(size-4);
_buffer.put(in);
state = State.BUFFERING;
break;
@@ -148,7 +149,7 @@ public class SASLFrameHandler implements
}
else
{
- ByteBuffer dup = in.duplicate();
+ QpidByteBuffer dup = in.duplicate();
dup.limit(dup.position()+_buffer.remaining());
int i = _buffer.remaining();
int d = dup.remaining();
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java Fri Aug 7 00:28:17 2015
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
import org.apache.qpid.amqp_1_0.codec.ProtocolHandler;
import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class SASLProtocolHeaderHandler implements ProtocolHandler
{
@@ -47,7 +48,7 @@ public class SASLProtocolHeaderHandler i
_connection = connection;
}
- public ProtocolHandler parse(final ByteBuffer in)
+ public ProtocolHandler parse(final QpidByteBuffer in)
{
while(in.hasRemaining() && _state != State.ERROR)
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java Fri Aug 7 00:28:17 2015
@@ -19,6 +19,7 @@
package org.apache.qpid.amqp_1_0.framing;
import org.apache.qpid.amqp_1_0.type.FrameBody;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
@@ -33,7 +34,7 @@ public final class TransportFrame extend
_channel = channel;
}
- public TransportFrame(short channel, FrameBody frameBody, ByteBuffer payload)
+ public TransportFrame(short channel, FrameBody frameBody, QpidByteBuffer payload)
{
super(frameBody, payload);
_channel = channel;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java Fri Aug 7 00:28:17 2015
@@ -21,6 +21,7 @@ package org.apache.qpid.amqp_1_0.messagi
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.Section;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
import java.util.List;
@@ -29,7 +30,7 @@ import java.util.List;
public interface SectionDecoder
{
- public List<Section> parseAll(ByteBuffer buf) throws AmqpErrorException;
- public Section readSection(ByteBuffer buf) throws AmqpErrorException;
+ List<Section> parseAll(QpidByteBuffer buf) throws AmqpErrorException;
+ Section readSection(QpidByteBuffer buf) throws AmqpErrorException;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java Fri Aug 7 00:28:17 2015
@@ -24,8 +24,8 @@ import org.apache.qpid.amqp_1_0.codec.Va
import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
import org.apache.qpid.amqp_1_0.type.Section;
import org.apache.qpid.amqp_1_0.type.codec.AMQPDescribedTypeRegistry;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
@@ -40,7 +40,7 @@ public class SectionDecoderImpl implemen
_valueHandler = new ValueHandler(describedTypeRegistry);
}
- public List<Section> parseAll(ByteBuffer buf) throws AmqpErrorException
+ public List<Section> parseAll(QpidByteBuffer buf) throws AmqpErrorException
{
List<Section> obj = new ArrayList<Section>();
@@ -53,7 +53,7 @@ public class SectionDecoderImpl implemen
return obj;
}
- public Section readSection(ByteBuffer buf) throws AmqpErrorException
+ public Section readSection(QpidByteBuffer buf) throws AmqpErrorException
{
return (Section) _valueHandler.parse(buf);
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java Fri Aug 7 00:28:17 2015
@@ -23,6 +23,7 @@ import org.apache.qpid.amqp_1_0.codec.Va
import org.apache.qpid.amqp_1_0.type.Binary;
import org.apache.qpid.amqp_1_0.type.codec.AMQPDescribedTypeRegistry;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -30,14 +31,14 @@ import java.util.List;
public class SectionEncoderImpl implements SectionEncoder
{
- private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(new byte[0]);
+ private static final QpidByteBuffer EMPTY_BYTE_BUFFER = QpidByteBuffer.wrap(new byte[0]);
private ValueWriter.Registry _registry;
private int _totalSize = 0;
private List<byte[]> _output = new ArrayList<byte[]>();
private static final int DEFAULT_BUFFER_SIZE = 64 * 1024;
- private ByteBuffer _current;
+ private QpidByteBuffer _current;
public SectionEncoderImpl(final AMQPDescribedTypeRegistry describedTypeRegistry)
{
@@ -73,7 +74,7 @@ public class SectionEncoderImpl implemen
int size = valueWriter.writeToBuffer(EMPTY_BYTE_BUFFER);
byte[] data = new byte[size];
- _current = ByteBuffer.wrap(data);
+ _current = QpidByteBuffer.wrap(data);
valueWriter.writeToBuffer(_current);
_output.add(data);
@@ -88,7 +89,7 @@ public class SectionEncoderImpl implemen
if(_current == null)
{
byte[] buf = new byte[data.length];
- _current = ByteBuffer.wrap(buf);
+ _current = QpidByteBuffer.wrap(buf);
_output.add(buf);
}
int remaining = _current.remaining();
@@ -99,7 +100,7 @@ public class SectionEncoderImpl implemen
_current.put(data,0,remaining);
byte[] dst = new byte[length-remaining];
_output.add(dst);
- _current = ByteBuffer.wrap(dst).put(data,remaining,length-remaining);
+ _current = QpidByteBuffer.wrap(dst).put(data,remaining,length-remaining);
}
else
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java Fri Aug 7 00:28:17 2015
@@ -75,6 +75,7 @@ import org.apache.qpid.amqp_1_0.type.tra
import org.apache.qpid.amqp_1_0.type.transport.Flow;
import org.apache.qpid.amqp_1_0.type.transport.Open;
import org.apache.qpid.amqp_1_0.type.transport.Transfer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Source, ValueWriter.Registry.Source,
@@ -82,7 +83,7 @@ public class ConnectionEndpoint implemen
{
private static final short CONNECTION_CONTROL_CHANNEL = (short) 0;
- private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(new byte[0]);
+ private static final QpidByteBuffer EMPTY_BYTE_BUFFER = QpidByteBuffer.wrap(new byte[0]);
private static final Symbol SASL_PLAIN = Symbol.valueOf("PLAIN");
private static final Symbol SASL_ANONYMOUS = Symbol.valueOf("ANONYMOUS");
private static final Symbol SASL_EXTERNAL = Symbol.valueOf("EXTERNAL");
@@ -686,13 +687,13 @@ public class ConnectionEndpoint implemen
}
- public synchronized int send(short channel, FrameBody body, ByteBuffer payload)
+ public synchronized int send(short channel, FrameBody body, QpidByteBuffer payload)
{
if (!_closedForOutput)
{
ValueWriter<FrameBody> writer = _describedTypeRegistry.getValueWriter(body);
int size = writer.writeToBuffer(EMPTY_BYTE_BUFFER);
- ByteBuffer payloadDup = payload == null ? null : payload.duplicate();
+ QpidByteBuffer payloadDup = payload == null ? null : payload.duplicate();
int payloadSent = getMaxFrameSize() - (size + 9);
if (payloadSent < (payload == null ? 0 : payload.remaining()))
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java Fri Aug 7 00:28:17 2015
@@ -53,6 +53,7 @@ import org.apache.qpid.amqp_1_0.type.tra
import org.apache.qpid.amqp_1_0.type.transport.LinkError;
import org.apache.qpid.amqp_1_0.type.transport.Role;
import org.apache.qpid.amqp_1_0.type.transport.Transfer;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class SessionEndpoint
{
@@ -323,7 +324,7 @@ public class SessionEndpoint
}
- private int send(final FrameBody frameBody, ByteBuffer payload)
+ private int send(final FrameBody frameBody, QpidByteBuffer payload)
{
return _connection.send(this.getSendingChannel(), frameBody, payload);
}
@@ -637,7 +638,7 @@ public class SessionEndpoint
try
{
- ByteBuffer payload = xfr.getPayload();
+ QpidByteBuffer payload = xfr.getPayload();
int payloadSent = send(xfr, payload);
if(payload != null && payloadSent < payload.remaining() && payloadSent >= 0)
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java?rev=1694594&r1=1694593&r2=1694594&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java Fri Aug 7 00:28:17 2015
@@ -31,13 +31,14 @@ import java.nio.ByteBuffer;
import org.apache.qpid.amqp_1_0.type.*;
+import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class Transfer
implements FrameBody
{
- private ByteBuffer _payload;
+ private QpidByteBuffer _payload;
private UnsignedInteger _handle;
@@ -285,12 +286,12 @@ public class Transfer
conn.receiveTransfer(channel, this);
}
- public void setPayload(ByteBuffer payload)
+ public void setPayload(QpidByteBuffer payload)
{
_payload = payload;
}
- public ByteBuffer getPayload()
+ public QpidByteBuffer getPayload()
{
return _payload;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org