Author: clebert.suconic(a)jboss.com Date: 2012-02-08 11:28:33 -0500 (Wed, 08 Feb 2012) New Revision: 12095 Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/QueueImpl.java Log: avoiding NPE Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/QueueImpl.java 2012-02-08 13:31:32 UTC (rev 12094) +++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/server/impl/QueueImpl.java 2012-02-08 16:28:33 UTC (rev 12095) @@ -1246,7 +1246,7 @@ } // If empty we need to schedule depaging to make sure we would depage expired messages as well - if ((!hasElements || expired && pageIterator != null) && pageIterator.hasNext()) + if ((!hasElements || expired) && pageIterator != null && pageIterator.hasNext()) { scheduleDepage(); }