Removing system outs, minor fixes and workarounds to do perf testing.
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java b/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java
index 3d931d5..4796db4 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder.java
@@ -374,19 +374,6 @@
increment();
}
- public void endInCurrentFrame() {
- int pos = getPosition();
- setPosition(current.start);
- writeF32(pos - current.start);
- writeF32(count);
- setPosition(pos);
- count = current.count;
- coder = current.coder;
- incrementor = current.incrementor;
- current = current.next;
- increment();
- }
-
@Override
public void putUshort(int i)
{
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder2.java b/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder2.java
index 0982bf2..f4a4156 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder2.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/codec2/AbstractEncoder2.java
@@ -361,7 +361,6 @@
if (current == null) {
throw new IllegalStateException("mismatched call to end()");
}
- System.out.println("Ending frame : " + current);
int pos = getPosition();
setPosition(current.start);
writeF32(pos - current.start);
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/codec2/POJOBuilder.java b/proton-j/src/main/java/org/apache/qpid/proton/codec2/POJOBuilder.java
index 676fbaa..e902ec6 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/codec2/POJOBuilder.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/codec2/POJOBuilder.java
@@ -58,7 +58,7 @@
else
{
DescribedTypeFactory factory = DiscriptorRegistry.lookup(descriptor);
- System.out.println(String.format("Described Builder: {descriptor=%s, factory=%s}", descriptor, factory));
+ //System.out.println(String.format("Described Builder: {descriptor=%s, factory=%s}", descriptor, factory));
if (factory != null)
{
try
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java
index 4340002..2bc88cf 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/FrameWriter2.java
@@ -50,7 +50,7 @@
static final byte SASL_FRAME_TYPE = (byte) 1;
- static final int DEFUALT_BUFFER_SIZE = Integer.getInteger("proton.encoder.buffer_size", 1024);
+ static final int DEFUALT_BUFFER_SIZE = Integer.getInteger("proton.encoder.buffer_size", 2048);
private ByteArrayEncoder _encoder;
@@ -206,7 +206,7 @@
}
endFrame(channel);
_framesOutput += 1;
- try
+ /*try
{
FileOutputStream fout = new FileOutputStream("/home/rajith/data/" + ((Performative) frameBody).getClass().getSimpleName());
fout.write(_buffer, _read, _position);
@@ -216,7 +216,7 @@
catch (Exception e)
{
e.printStackTrace();
- }
+ }*/
}
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java
index beaca12..e62738d 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl2.java
@@ -94,7 +94,7 @@
private ByteArrayEncoder _encoder = new ByteArrayEncoder();
private int _maxFrameSize = DEFAULT_MAX_FRAME_SIZE;
- private int _remoteMaxFrameSize = 512;
+ private int _remoteMaxFrameSize = 2048;
private int _channelMax = 65535;
private int _remoteChannelMax = 65535;
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageImpl2.java b/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageImpl2.java
index c01f706..53385bf 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageImpl2.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/message2/MessageImpl2.java
@@ -721,7 +721,7 @@
_footer.encode(encoder);
}
- byte[] temp = new byte[encoder.getPosition()];
+ /*byte[] temp = new byte[encoder.getPosition()];
System.arraycopy(data, offset, temp, 0, encoder.getPosition());
try
@@ -732,7 +732,7 @@
{
// TODO Auto-generated catch block
e.printStackTrace();
- }
+ }*/
return encoder.getPosition();
}
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java
index 993d4cc..e0adab1 100644
--- a/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java
+++ b/proton-j/src/main/java/org/apache/qpid/proton/transport2/Transfer.java
@@ -209,7 +209,6 @@
{
List<Object> l = (List<Object>) in;
Transfer transfer = new Transfer();
- System.out.println(l);
switch (11 - l.size())
{
case 0:
