Author: clebert.suconic(a)jboss.com Date: 2011-05-13 12:21:21 -0400 (Fri, 13 May 2011) New Revision: 10662 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java Log: fixing tests Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-05-13 14:00:28 UTC (rev 10661) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-05-13 16:21:21 UTC (rev 10662) @@ -413,7 +413,7 @@ public Executor getExecutor() { - if (pageSubscription.isPaging()) + if (pageSubscription != null && pageSubscription.isPaging()) { // When in page mode, we don't want to have concurrent IO on the same PageStore return pageSubscription.getExecutor();