--- a/hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp	Sun Feb 28 12:22:05 2016 -0500
+++ b/hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp	Mon Feb 29 13:06:03 2016 +0100
@@ -81,10 +81,7 @@
 }
 
 void G1HotCardCache::drain(CardTableEntryClosure* cl, uint worker_i) {
-  if (!default_use_cache()) {
-    assert(_hot_cache == NULL, "Logic");
-    return;
-  }
+  assert(default_use_cache(), "Drain only necessary if we use the hot card cache.");
 
   assert(_hot_cache != NULL, "Logic");
   assert(!use_cache(), "cache should be disabled");