--- old/src/share/vm/runtime/jniHandles.cpp	2017-07-20 18:59:24.723754766 -0400
+++ new/src/share/vm/runtime/jniHandles.cpp	2017-07-20 18:59:24.623749586 -0400
@@ -276,7 +276,7 @@
 
 void JNIHandleBlock::zap() {
   // Zap block values
-  _top  = 0;
+  _top = 0;
   for (int index = 0; index < block_size_in_oops; index++) {
     _handles[index] = badJNIHandle;
   }
@@ -314,7 +314,7 @@
       _block_free_list = _block_free_list->_next;
     }
   }
-  block->_top  = 0;
+  block->_top = 0;
   block->_next = NULL;
   block->_pop_frame_link = NULL;
   block->_planned_capacity = block_size_in_oops;
@@ -447,7 +447,7 @@
       if (current->_top == 0) {
         // All blocks after the first clear trailing block are already cleared.
 #ifdef ASSERT
-        for ( ; current != NULL; current = current->_next) {
+        for (current = current->_next; current != NULL; current = current->_next) {
           assert(current->_top == 0, "trailing blocks must already be cleared");
         }
 #endif
--- old/src/share/vm/runtime/jniHandles.hpp	2017-07-20 18:59:25.255782262 -0400
+++ new/src/share/vm/runtime/jniHandles.hpp	2017-07-20 18:59:25.151776892 -0400
@@ -149,11 +149,6 @@
   // Fill block with bad_handle values
   void zap();
 
- protected:
-  // No more handles in the both the current and following blocks
-  void clear() { _top = 0; }
-
- private:
   // Free list computation
   void rebuild_free_list();