changeset 9881:1bd6e464e8df

8049057: JNI exception pending in jdk/src/windows/native/sun/windows/ Reviewed-by: pchelko, prr
author serb
date Sat, 26 Jul 2014 03:18:05 +0400
parents 8abaabf18ac5
children efd23426486a
files src/windows/native/sun/windows/awt_Component.cpp src/windows/native/sun/windows/awt_Cursor.cpp src/windows/native/sun/windows/awt_PrintJob.cpp
diffstat 3 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Component.cpp	Thu Jul 31 22:23:36 2014 +0400
+++ b/src/windows/native/sun/windows/awt_Component.cpp	Sat Jul 26 03:18:05 2014 +0400
@@ -467,7 +467,9 @@
         jclass win32GCCls = env->FindClass("sun/awt/Win32GraphicsConfig");
         DASSERT(win32GCCls != NULL);
         DASSERT(env->IsInstanceOf(compGC, win32GCCls));
-        CHECK_NULL(win32GCCls);
+        if (win32GCCls == NULL) {
+            throw std::bad_alloc();
+        }
         env->SetObjectField(peer, AwtComponent::peerGCID, compGC);
     }
 }
--- a/src/windows/native/sun/windows/awt_Cursor.cpp	Thu Jul 31 22:23:36 2014 +0400
+++ b/src/windows/native/sun/windows/awt_Cursor.cpp	Sat Jul 26 03:18:05 2014 +0400
@@ -229,9 +229,10 @@
                 if (cur != NULL) {
                     ::SetCursor(cur);
                 } else {
-                    safe_ExceptionOccurred(env);
+                    if (safe_ExceptionOccurred(env)) {
+                        env->ExceptionClear();
+                    }
                 }
-
                 if (AwtCursor::updateCursorID == NULL) {
                     jclass cls =
                     env->FindClass("sun/awt/windows/WGlobalCursorManager");
--- a/src/windows/native/sun/windows/awt_PrintJob.cpp	Thu Jul 31 22:23:36 2014 +0400
+++ b/src/windows/native/sun/windows/awt_PrintJob.cpp	Sat Jul 26 03:18:05 2014 +0400
@@ -758,6 +758,7 @@
   // through print dialog or start of printing
   // None of those may have happened yet, so call initPrinter()
   initPrinter(env, self);
+  JNU_CHECK_EXCEPTION(env);
   HANDLE hDevNames = AwtPrintControl::getPrintHDName(env, self);
   HDC hdc = AwtPrintControl::getPrintDC(env, self);
 
@@ -1102,6 +1103,7 @@
     jboolean err;
 
     initPrinter(env, self);
+    JNU_CHECK_EXCEPTION(env);
 
     // check for collation
     HGLOBAL hDevNames = AwtPrintControl::getPrintHDName(env, self);
@@ -1362,6 +1364,13 @@
     }
 
     initPrinter(env, self);
+    if (env->ExceptionCheck()) {
+        if (dest != NULL) {
+            JNU_ReleaseStringPlatformChars(env, dest, destination);
+        }
+        return JNI_FALSE;
+    }
+
     HDC printDC = AwtPrintControl::getPrintDC(env, self);
 
     SAVE_CONTROLWORD
@@ -3827,6 +3836,7 @@
     // pixels per inch in y direction
     jint yRes = GetDeviceCaps(printDC, LOGPIXELSY);
     err = setIntField(env, self, YRES_STR, yRes);
+    if (err) return;
 
     // x coord of printable area in pixels
     jint xOrg = GetDeviceCaps(printDC, PHYSICALOFFSETX);