You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2014/09/26 23:37:47 UTC
[1/3] git commit: Removing of HawtBuf usage.
Repository: qpid-jms
Updated Branches:
refs/heads/master fd7b3b20c -> 2e687e945
Removing of HawtBuf usage.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/0d4d9d46
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0d4d9d46
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0d4d9d46
Branch: refs/heads/master
Commit: 0d4d9d46c51dbaf73ddd0edfd4f51232f1c272f1
Parents: fd7b3b2
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Sep 26 17:13:35 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 26 17:13:35 2014 -0400
----------------------------------------------------------------------
.../jms/provider/amqp/AmqpFixedProducer.java | 39 +++++++++++---------
1 file changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d4d9d46/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
index dae51f3..020b12f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
@@ -49,7 +49,6 @@ import org.apache.qpid.proton.jms.AutoOutboundTransformer;
import org.apache.qpid.proton.jms.EncodedMessage;
import org.apache.qpid.proton.jms.OutboundTransformer;
import org.apache.qpid.proton.message.Message;
-import org.fusesource.hawtbuf.Buffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -172,13 +171,13 @@ public class AmqpFixedProducer extends AmqpProducer {
}
}
- Buffer sendBuffer = new Buffer(encodeBuffer, 0, encodedSize);
+ int sentSoFar = 0;
while (true) {
- int sent = endpoint.send(sendBuffer.data, sendBuffer.offset, sendBuffer.length);
+ int sent = endpoint.send(encodeBuffer, sentSoFar, encodedSize - sentSoFar);
if (sent > 0) {
- sendBuffer.moveHead(sent);
- if (sendBuffer.length == 0) {
+ sentSoFar += sent;
+ if ((encodedSize - sentSoFar) == 0) {
break;
}
} else {
@@ -189,7 +188,10 @@ public class AmqpFixedProducer extends AmqpProducer {
private void encodeAndSend(JmsMessage message, Delivery delivery) throws IOException {
- Buffer sendBuffer = null;
+ byte[] sendBuffer = null;
+ int sendBufferSize = 0;
+ int sendBufferOffset = 0;
+
EncodedMessage amqp = null;
try {
@@ -199,18 +201,21 @@ public class AmqpFixedProducer extends AmqpProducer {
}
if (amqp != null && amqp.getLength() > 0) {
- sendBuffer = new Buffer(amqp.getArray(), amqp.getArrayOffset(), amqp.getLength());
- }
-
- while (true) {
- int sent = endpoint.send(sendBuffer.data, sendBuffer.offset, sendBuffer.length);
- if (sent > 0) {
- sendBuffer.moveHead(sent);
- if (sendBuffer.length == 0) {
- break;
+ sendBuffer = amqp.getArray();
+ sendBufferOffset = amqp.getArrayOffset();
+ sendBufferSize = amqp.getLength();
+ int sentSoFar = 0;
+
+ while (true) {
+ int sent = endpoint.send(sendBuffer, sendBufferOffset + sentSoFar, sendBufferSize - sentSoFar);
+ if (sent > 0) {
+ sentSoFar += sent;
+ if ((sendBufferSize - sentSoFar) == 0) {
+ break;
+ }
+ } else {
+ LOG.warn("{} failed to send any data from current Message.", this);
}
- } else {
- LOG.warn("{} failed to send any data from current Message.", this);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] git commit: Remove use of HawtBuf
Posted by ta...@apache.org.
Remove use of HawtBuf
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/10b92884
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/10b92884
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/10b92884
Branch: refs/heads/master
Commit: 10b92884b52ea16c24a83a4ecb87c80424a1b941
Parents: 0d4d9d4
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Sep 26 17:23:22 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 26 17:23:22 2014 -0400
----------------------------------------------------------------------
.../org/apache/qpid/jms/provider/amqp/AmqpConsumer.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/10b92884/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index 790a924..d949b70 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -16,6 +16,7 @@
*/
package org.apache.qpid.jms.provider.amqp;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -50,8 +51,6 @@ import org.apache.qpid.proton.engine.Receiver;
import org.apache.qpid.proton.jms.EncodedMessage;
import org.apache.qpid.proton.jms.InboundTransformer;
import org.apache.qpid.proton.jms.JMSMappingInboundTransformer;
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.ByteArrayOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -422,17 +421,17 @@ public class AmqpConsumer extends AbstractAmqpResource<JmsConsumerInfo, Receiver
}
protected EncodedMessage readIncomingMessage(Delivery incoming) {
- Buffer buffer;
+ byte[] buffer;
int count;
while ((count = endpoint.recv(incomingBuffer, 0, incomingBuffer.length)) > 0) {
streamBuffer.write(incomingBuffer, 0, count);
}
- buffer = streamBuffer.toBuffer();
+ buffer = streamBuffer.toByteArray();
try {
- return new EncodedMessage(incoming.getMessageFormat(), buffer.data, buffer.offset, buffer.length);
+ return new EncodedMessage(incoming.getMessageFormat(), buffer, 0, buffer.length);
} finally {
streamBuffer.reset();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] git commit: Remove use of HawtBuf
Posted by ta...@apache.org.
Remove use of HawtBuf
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2e687e94
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2e687e94
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2e687e94
Branch: refs/heads/master
Commit: 2e687e9455a8f297aade142744bb1c52e1fc31a0
Parents: 10b9288
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Sep 26 17:37:38 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 26 17:37:38 2014 -0400
----------------------------------------------------------------------
.../defaults/JmsDefaultObjectMessageFacade.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2e687e94/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java
index 89442b9..f9bf220 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultObjectMessageFacade.java
@@ -16,28 +16,28 @@
*/
package org.apache.qpid.jms.message.facade.defaults;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import java.util.Arrays;
import org.apache.qpid.jms.message.facade.JmsObjectMessageFacade;
import org.apache.qpid.jms.util.ClassLoadingAwareObjectInputStream;
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
/**
* Default implementation for a JMS Object Message Facade.
*/
public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade implements JmsObjectMessageFacade {
- private Buffer object;
+ private byte[] object;
- public Buffer getSerializedObject() {
+ public byte[] getSerializedObject() {
return object;
}
- public void setSerializedObject(Buffer object) {
+ public void setSerializedObject(byte[] object) {
this.object = object;
}
@@ -48,7 +48,7 @@ public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade imple
@Override
public boolean isEmpty() {
- return object == null || object.isEmpty();
+ return object == null || object.length == 0;
}
@Override
@@ -56,7 +56,7 @@ public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade imple
JmsDefaultObjectMessageFacade copy = new JmsDefaultObjectMessageFacade();
copyInto(copy);
if (!isEmpty()) {
- copy.object = object.deepCopy();
+ copy.object = Arrays.copyOf(object, object.length);
}
return copy;
@@ -76,7 +76,7 @@ public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade imple
Serializable serialized = null;
- try (DataByteArrayInputStream dataIn = new DataByteArrayInputStream(object);
+ try (ByteArrayInputStream dataIn = new ByteArrayInputStream(object);
ClassLoadingAwareObjectInputStream objIn = new ClassLoadingAwareObjectInputStream(dataIn)) {
serialized = (Serializable) objIn.readObject();
@@ -87,16 +87,16 @@ public class JmsDefaultObjectMessageFacade extends JmsDefaultMessageFacade imple
@Override
public void setObject(Serializable value) throws IOException {
- Buffer serialized = null;
+ byte[] serialized = null;
if (value != null) {
- try (DataByteArrayOutputStream baos = new DataByteArrayOutputStream();
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos)) {
oos.writeObject(value);
oos.flush();
oos.close();
- serialized = baos.toBuffer();
+ serialized = baos.toByteArray();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org