Author: jstrachan
Date: Mon Dec 19 08:19:51 2005
New Revision: 357717
URL: http://svn.apache.org/viewcvs?rev=357717&view=rev
Log:
avoided NPE in a number of test cases
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java?rev=357717&r1=357716&r2=357717&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java
Mon Dec 19 08:19:51 2005
@@ -111,7 +111,9 @@
this.connector = connector;
this.broker = broker;
- this.statistics.setParent(connector.getStatistics());
+ if (connector != null) {
+ this.statistics.setParent(connector.getStatistics());
+ }
if( taskRunnerFactory != null ) {
taskRunner = taskRunnerFactory.createTaskRunner( this );