Merge branch 'youtrack-7.0-hub-2.0'

JetBrains · Jul 21, 2016 · 59891d3 · 59891d3
2 parents c1118bc + 25d73b2
commit 59891d3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/environment/src/main/java/jetbrains/exodus/tree/btree/BTreeMutable.java b/environment/src/main/java/jetbrains/exodus/tree/btree/BTreeMutable.java
@@ -333,7 +333,9 @@ public boolean reclaim(@NotNull RandomAccessLoggable loggable,
             // if we have reached the end of file and the tree seems to be rather heavyweight then looks like
             // it was a huge transaction that saved the tree, and it's reasonable to stop here, without
             // reaching the tree's root, in order to avoid possible OOME (XD-513)
-            if (type == NullLoggable.TYPE && expiredLoggables.size() > MAX_EXPIRED_LOGGABLES_TO_CONTINUE_RECLAIM_ON_A_NEW_FILE) {
+            if (type == NullLoggable.TYPE &&
+                    expiredLoggables != null && // this check fixes XD-532 & XD-538
+                    expiredLoggables.size() > MAX_EXPIRED_LOGGABLES_TO_CONTINUE_RECLAIM_ON_A_NEW_FILE) {
                 break;
             }
             loggable = loggables.next();