Repository: qpid-jms Updated Branches: refs/heads/master c57094e93 -> 59a5ae3d2
Use a more OSGI friendly way of creating Vert.x which also allows use of more recent Vert.x versions if we need to work around issues until we switch over to Netty Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/59a5ae3d Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/59a5ae3d Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/59a5ae3d Branch: refs/heads/master Commit: 59a5ae3d21b4cb80dfb3cb1f56e33071ce69be81 Parents: c57094e Author: Timothy Bish <[email protected]> Authored: Wed Sep 24 09:30:37 2014 -0400 Committer: Timothy Bish <[email protected]> Committed: Wed Sep 24 09:30:37 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/qpid/jms/transports/TcpTransport.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/59a5ae3d/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 4a58c8e..cbe9305 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 @@ -30,8 +30,8 @@ import org.vertx.java.core.AsyncResult; import org.vertx.java.core.AsyncResultHandler; import org.vertx.java.core.Handler; import org.vertx.java.core.Vertx; -import org.vertx.java.core.VertxFactory; import org.vertx.java.core.buffer.Buffer; +import org.vertx.java.core.impl.DefaultVertxFactory; import org.vertx.java.core.net.NetClient; import org.vertx.java.core.net.NetSocket; @@ -42,8 +42,8 @@ public class TcpTransport implements Transport { private static final Logger LOG = LoggerFactory.getLogger(TcpTransport.class); - private final Vertx vertx = VertxFactory.newVertx(); - private final NetClient client = vertx.createNetClient(); + private final Vertx vertx; + private final NetClient client; private final URI remoteLocation; private final AtomicBoolean connected = new AtomicBoolean(); private final AtomicBoolean closed = new AtomicBoolean(); @@ -70,6 +70,10 @@ public class TcpTransport implements Transport { public TcpTransport(TransportListener listener, URI remoteLocation) { this.listener = listener; this.remoteLocation = remoteLocation; + + DefaultVertxFactory vertxFactory = new DefaultVertxFactory(); + this.vertx = vertxFactory.createVertx(); + this.client = vertx.createNetClient(); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
