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 2012/09/26 15:23:26 UTC

svn commit: r1390467 - in /qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton: driver/NIOAcceptingDriver.java engine/impl/TransportFactoryImpl.java

Author: rgodfrey
Date: Wed Sep 26 13:23:25 2012
New Revision: 1390467

URL: http://svn.apache.org/viewvc?rev=1390467&view=rev
Log:
NO-JIRA : update proton-j to match API changes around connection/transport

Modified:
    qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/driver/NIOAcceptingDriver.java
    qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java

Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/driver/NIOAcceptingDriver.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/driver/NIOAcceptingDriver.java?rev=1390467&r1=1390466&r2=1390467&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/driver/NIOAcceptingDriver.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/driver/NIOAcceptingDriver.java Wed Sep 26 13:23:25 2012
@@ -82,7 +82,8 @@ public class NIOAcceptingDriver implemen
                         SocketChannel newChan = channel.accept();
                         newChan.configureBlocking(false);
                         ConnectionImpl connection = new ConnectionImpl();
-                        Transport amqpTransport = connection.transport();
+                        Transport amqpTransport = new TransportImpl();
+                        amqpTransport.bind(connection);
                         Map<byte[], Transport> transportMap = new HashMap<byte[], Transport>();
                         transportMap.put(TransportImpl.HEADER, amqpTransport);
                         DelegatingTransport transport = new DelegatingTransport(transportMap, amqpTransport);

Modified: qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java?rev=1390467&r1=1390466&r2=1390467&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java Wed Sep 26 13:23:25 2012
@@ -27,7 +27,9 @@ class TransportFactoryImpl extends Trans
 {
     public Transport transport(Connection c)
     {
-        return new TransportImpl(c);
+        TransportImpl t = new TransportImpl();
+        t.bind(c);
+        return t;
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org