<AWT Dev> RFR: 8081231: JDK9 client build broken on Windows

Phil Race philip.race at oracle.com
Tue May 26 18:48:07 UTC 2015


https://bugs.openjdk.java.net/browse/JDK-8081231


ShellFolder2 only gets a definition of DASSERT if DEBUG is defined.

Proposed fix :-

diff --git 
a/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp 
b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
--- a/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
@@ -66,7 +66,9 @@

  #define DEFINE_FIELD_ID(var, cls, field, type) \
      jfieldID var = env->GetFieldID(cls, field, type); \
+#ifdef DEBUG
      DASSERT(var != NULL); \
+#endif
      CHECK_NULL_RETURN(var, NULL);

-phil.


More information about the awt-dev mailing list