QPID-1339:

 - Removed the Channel class in order to simplify the state management
   surrounding Sessions and Connections.

 - Consolidated the ChannelDelegate into the ConnectionDelegate.

 - Modified MethodDelegate to invoke a generic handle method as the
   default action for each dispatched method.

 - Modified the code generator to produce a separate ConnectionInvoker
   and SessionInvoker.

 - Modified the invoker template to use package level visibility for
   all controls rather than public visibility.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@704147 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 8 deletions

diff --git a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index e61ffb501b..03fae56250 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
+++ b/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
@@ -51,10 +51,10 @@ public class ConnectionTest extends TestCase
         port = AvailablePortFinder.getNextAvailable(12000);
 
         ConnectionDelegate server = new ServerDelegate() {
-            @Override public void connectionOpen(Channel ch, ConnectionOpen open)
+            @Override public void connectionOpen(Connection conn, ConnectionOpen open)
             {
-                super.connectionOpen(ch, open);
-                ch.getConnection().close();
+                super.connectionOpen(conn, open);
+                conn.close();
             }
         };
 
@@ -94,13 +94,9 @@ public class ConnectionTest extends TestCase
             fail("never got notified of connection close");
         }
 
-        Channel ch = conn.getChannel(0);
-        Session ssn = new Session("test".getBytes());
-        ssn.attach(ch);
-
         try
         {
-            ssn.sessionAttach(ssn.getName());
+            conn.connectionCloseOk();
             fail("writing to a closed socket succeeded");
         }
         catch (TransportException e)