Author: clebert.suconic(a)jboss.com Date: 2011-12-13 12:25:49 -0500 (Tue, 13 Dec 2011) New Revision: 11903 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java Log: JBPAPP-7727 - Fixing possible NPE Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-12-13 17:04:05 UTC (rev 11902) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-12-13 17:25:49 UTC (rev 11903) @@ -671,9 +671,10 @@ } else { - if (connection != null) + CoreRemotingConnection connectionToDestory = connection; + if (connectionToDestory != null) { - connection.destroy(); + connectionToDestory.destroy(); } connection = null;