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/27 00:17:28 UTC
git commit: Remove use of HawtBuf
Repository: qpid-jms
Updated Branches:
refs/heads/master 2e687e945 -> 42dca618f
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/42dca618
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/42dca618
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/42dca618
Branch: refs/heads/master
Commit: 42dca618fab8ff25a44b3b75560f4697c085393e
Parents: 2e687e9
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Sep 26 18:15:29 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 26 18:15:29 2014 -0400
----------------------------------------------------------------------
.../org/apache/qpid/jms/transports/RawTcpTransport.java | 6 ++++--
.../java/org/apache/qpid/jms/transports/TcpTransport.java | 9 +++++----
.../main/java/org/apache/qpid/jms/transports/Transport.java | 6 +++---
3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/42dca618/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java
index ae96ed7..6d99849 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/RawTcpTransport.java
@@ -16,6 +16,8 @@
*/
package org.apache.qpid.jms.transports;
+import io.netty.buffer.ByteBuf;
+
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -187,9 +189,9 @@ public class RawTcpTransport implements Transport, Runnable {
}
@Override
- public void send(org.fusesource.hawtbuf.Buffer output) throws IOException {
+ public void send(ByteBuf output) throws IOException {
checkConnected();
- send(output.toByteBuffer());
+ send(output.nioBuffer());
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/42dca618/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TcpTransport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TcpTransport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TcpTransport.java
index cbe9305..121084c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TcpTransport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TcpTransport.java
@@ -16,6 +16,8 @@
*/
package org.apache.qpid.jms.transports;
+import io.netty.buffer.ByteBuf;
+
import java.io.IOException;
import java.net.URI;
import java.nio.ByteBuffer;
@@ -171,15 +173,14 @@ public class TcpTransport implements Transport {
}
@Override
- public void send(org.fusesource.hawtbuf.Buffer output) throws IOException {
+ public void send(ByteBuf output) throws IOException {
checkConnected();
- int length = output.length();
+ int length = output.readableBytes();
if (length == 0) {
return;
}
- org.fusesource.hawtbuf.Buffer clone = output.deepCopy();
- Buffer sendBuffer = new Buffer(clone.data);
+ Buffer sendBuffer = new Buffer(output.copy());
vertx.eventBus().send(socket.writeHandlerID(), sendBuffer);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/42dca618/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/Transport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/Transport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/Transport.java
index 4cced80..d8e221e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/Transport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/Transport.java
@@ -16,11 +16,11 @@
*/
package org.apache.qpid.jms.transports;
+import io.netty.buffer.ByteBuf;
+
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.fusesource.hawtbuf.Buffer;
-
/**
* Base class for all QpidJMS Transport instances.
*/
@@ -64,7 +64,7 @@ public interface Transport {
*
* @throws IOException if an error occurs during the send operation.
*/
- void send(Buffer output) throws IOException;
+ void send(ByteBuf output) throws IOException;
/**
* Gets the currently set TransportListener instance
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org