summaryrefslogtreecommitdiff
path: root/java/common/src
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2011-08-25 10:46:39 +0000
committerKeith Wall <kwall@apache.org>2011-08-25 10:46:39 +0000
commitf9f222d00f57c52ccdb526b4bd7e991a05755fb3 (patch)
tree2b4b508f10f0fb14a5e8283cf6ddfeccf1d7a3d6 /java/common/src
parentdd48476d3eacf9b4d084604942956f8e29e9ddf6 (diff)
downloadqpid-python-f9f222d00f57c52ccdb526b4bd7e991a05755fb3.tar.gz
QPID-3452: Broker now unregisters any remaining subscriptions on receipt of SessionDetach to prevent SubFlushRunner and QueueRunner sending erroneous frames causing a ProtocolViolationException on the client.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1161492 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/src')
-rw-r--r--java/common/src/main/java/org/apache/qpid/transport/Connection.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index eef6c047d3..82a6cdaa67 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -35,7 +35,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslServer;
@@ -406,7 +405,7 @@ public class Connection extends ConnectionInvoker
else
{
throw new ProtocolViolationException(
- "Received frames for an already dettached session", null);
+ "Received frames for an already detached session", null);
}
}
@@ -455,7 +454,7 @@ public class Connection extends ConnectionInvoker
}
}
- protected Session getSession(int channel)
+ public Session getSession(int channel)
{
synchronized (lock)
{