Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk

changeset 9300:3d19e084fda9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8035847: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp Reviewed-by: anthony, serb
author pchelko
date Mon, 31 Mar 2014 17:14:41 +0400
parents 48448f8ec04e
children 77bf27c8f7e8
files src/windows/native/sun/windows/awt_InputTextInfor.cpp
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_InputTextInfor.cpp	Mon Mar 31 17:13:07 2014 +0400
+++ b/src/windows/native/sun/windows/awt_InputTextInfor.cpp	Mon Mar 31 17:14:41 2014 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,6 +132,7 @@
     JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
     if (m_cStrW > 0) {
         m_jtext = MakeJavaString(env, m_lpStrW, m_cStrW);
+        JNU_CHECK_EXCEPTION_RETURN(env, -1);
     }
 
     // Merge the string if necessary
@@ -251,6 +252,13 @@
             } else {
                 readingClauseW[cls] = MakeJavaString(env, lpHWStrW, cHWStrW);
             }
+            if (env->ExceptionCheck()) {
+                lpBndClauseW = NULL;
+                lpReadingClauseW = NULL;
+                delete [] bndClauseW;
+                delete [] readingClauseW;
+                return 0;
+            }
         }
         else {
             readingClauseW[cls] = NULL;