diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-02-20 16:17:57 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-02-20 16:17:57 +0000 |
| commit | 74ab215737ab1943f1366b0400d90429d309cc03 (patch) | |
| tree | 9b76fe48148523c8ac017175ee5c0630ea62c00f /qpid/java | |
| parent | aa5601da0b9c769559c6ed883da9f138f1505b4c (diff) | |
| download | qpid-python-74ab215737ab1943f1366b0400d90429d309cc03.tar.gz | |
QPID-3857: remove the protected Impl method now that we dont need the Session reference, and just call super.sessionAttach instead.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291345 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java | 2 | ||||
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java index 97d403213e..a957ef84bf 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java @@ -255,7 +255,7 @@ public class ServerConnectionDelegate extends ServerDelegate if(isSessionNameUnique(atc.getName(), conn)) { - ssn = sessionAttachImpl(conn, atc); + super.sessionAttach(conn, atc); ((ServerConnection)conn).checkForNotification(); } else diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java index be51a27da1..ec409d1c72 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java @@ -191,18 +191,11 @@ public class ServerDelegate extends ConnectionDelegate @Override public void sessionAttach(Connection conn, SessionAttach atc) { - sessionAttachImpl(conn, atc); - } - - protected Session sessionAttachImpl(Connection conn, SessionAttach atc) - { Session ssn = getSession(conn, atc); conn.map(ssn, atc.getChannel()); conn.registerSession(ssn); ssn.sessionAttached(atc.getName()); ssn.setState(Session.State.OPEN); - - return ssn; } protected void setConnectionTuneOkChannelMax(final Connection conn, final int okChannelMax) |