Author: clebert.suconic(a)jboss.com Date: 2012-02-08 11:28:54 -0500 (Wed, 08 Feb 2012) New Revision: 12097 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/QueueImpl.java Log: avoiding NPE Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/QueueImpl.java 2012-02-08 16:28:51 UTC (rev 12096) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/QueueImpl.java 2012-02-08 16:28:54 UTC (rev 12097) @@ -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(); }