[hornetq-commits] JBoss hornetq SVN: r12096 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2012-02-08 11:28:51 -0500 (Wed, 08 Feb 2012)
New Revision: 12096

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java
Log:
Avoiding NPE

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	2012-02-08 16:28:33 UTC (rev 12095)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java	2012-02-08 16:28:51 UTC (rev 12096)
@@ -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();
                   }