diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-10-30 18:42:37 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-10-30 18:42:37 +0000 |
| commit | 7e185ac8cc310718ac8f492df1d4c787cce95d3d (patch) | |
| tree | 8f475af6e5cf266fccbb66d0bf138163e965d71f /qpid/java/common/src | |
| parent | ef18e29768d66d87ae9895f97773d2dd98fa50fd (diff) | |
| download | qpid-python-7e185ac8cc310718ac8f492df1d4c787cce95d3d.tar.gz | |
QPID-3428: update to stop duplicate 0-10 session registrations into the management layer, fixes a leak of the session and its associated connection at session removal time.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1195212 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java | 4 | ||||
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java index 06c5c83031..b78433052c 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java @@ -697,9 +697,9 @@ public class Connection extends ConnectionInvoker return channels.values(); } - public boolean hasSessionWithName(final String name) + public boolean hasSessionWithName(final byte[] name) { - return sessions.containsKey(new Binary(name.getBytes())); + return sessions.containsKey(new Binary(name)); } public void notifyFailoverRequired() 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 82fa6ca473..07d21c9904 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 @@ -195,10 +195,17 @@ 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()); ssn.sessionAttached(atc.getName()); ssn.setState(Session.State.OPEN); + + return ssn; } protected void setConnectionTuneOkChannelMax(final Connection conn, final int okChannelMax) |