QPID-5195: verify _receivingSessions array has been initialised before accessing it during closure

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

1 files changed, 7 insertions, 4 deletions

diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
index cac4e88178..5775eb4c2e 100644
--- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
@@ -410,13 +410,16 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour
                 default:
             }
 
-            for (int i = 0; i < _receivingSessions.length; i++)
+            if(_receivingSessions != null)
             {
-                if (_receivingSessions[i] != null)
+                for (int i = 0; i < _receivingSessions.length; i++)
                 {
-                    _receivingSessions[i].end();
-                    _receivingSessions[i] = null;
+                    if (_receivingSessions[i] != null)
+                    {
+                        _receivingSessions[i].end();
+                        _receivingSessions[i] = null;
 
+                    }
                 }
             }
         }