1 files changed, 4 insertions, 10 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
index 17bd06538f..c87919b478 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
@@ -1261,11 +1261,10 @@ public class ServerSessionDelegate extends SessionDelegate
     {
         setThreadSubject(session);
 
-        for(Subscription_0_10 sub : getSubscriptions(session))
-        {
-            ((ServerSession)session).unregister(sub);
-        }
-        ((ServerSession)session).onClose();
+        ServerSession serverSession = (ServerSession)session;
+
+        serverSession.unregisterSubscriptions();
+        serverSession.onClose();
     }
 
     @Override
@@ -1274,11 +1273,6 @@ public class ServerSessionDelegate extends SessionDelegate
         closed(session);
     }
 
-    public Collection<Subscription_0_10> getSubscriptions(Session session)
-    {
-        return ((ServerSession)session).getSubscriptions();
-    }
-
     private void setThreadSubject(Session session)
     {
         final ServerConnection scon = (ServerConnection) session.getConnection();