Author: clebert.suconic(a)jboss.com Date: 2010-11-29 17:34:59 -0500 (Mon, 29 Nov 2010) New Revision: 9941 Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java Log: tweak Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-11-29 19:20:34 UTC (rev 9940) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-11-29 22:34:59 UTC (rev 9941) @@ -1109,7 +1109,12 @@ } // To recover positions on Iterators - pagingManager.processReload(); + if (pagingManager != null) + { + // it could be null on certain tests that are not dealing with paging + // This could also be the case in certain embedded conditions + pagingManager.processReload(); + } if (perfBlastPages != -1) {