# HG changeset patch
# User ctornqvi
# Date 1463756238 0
# Node ID 3444f0668c839dd7aa7c0a2ba049cc48f086be8e
# Parent  1b67cf900783a2f2247d2206523a022543c546ff# Parent  c053db913695cbf7f7126b96c45bb1ac32fdf5d3
Merge

diff -r c053db913695 -r 3444f0668c83 hotspot/src/os/windows/vm/os_windows.cpp
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Fri May 20 01:47:32 2016 -0400
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Fri May 20 14:57:18 2016 +0000
@@ -5277,7 +5277,8 @@
         }
       }
       DWORD err = GetLastError();
-      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED) {
+      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED &&
+         (err == ERROR_INVALID_FUNCTION && phe.lpData != NULL)) {
         HeapUnlock(heap);
         fatal("heap walk aborted with error %d", err);
       }
diff -r c053db913695 -r 3444f0668c83 hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java
--- a/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java	Fri May 20 01:47:32 2016 -0400
+++ b/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java	Fri May 20 14:57:18 2016 +0000
@@ -24,7 +24,7 @@
 /*
  * @test
  * @library /testlibrary
- *
+ * @requires vm.flavor != "minimal"
  * @run main/othervm/native -agentlib:SimpleClassFileLoadHook=Foo,XXX,YYY
  *      SimpleClassFileLoadHookTest
  */