changeset 10397:556c79ef8a1d jdk8u25-b31

Merge
author asaha
date Tue, 07 Oct 2014 08:37:30 -0700
parents d82eaeba8595 65e300d8a3d8
children 5c06b8274d27 b1cf98897adc
files .hgtags
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Sep 24 08:47:13 2014 -0700
+++ b/.hgtags	Tue Oct 07 08:37:30 2014 -0700
@@ -335,3 +335,4 @@
 0000000000000000000000000000000000000000 jdk8u25-b16
 d067890f970f3a712f870f6311d20f3359b6eaf0 jdk8u25-b16
 67b22a82345bfa1ae1492679bdf3c4d54f4eacde jdk8u25-b17
+a4e88eaf15ea0569f3275a807a976fe0e04a086c jdk8u25-b18
--- a/src/windows/native/sun/windows/awt_Component.cpp	Wed Sep 24 08:47:13 2014 -0700
+++ b/src/windows/native/sun/windows/awt_Component.cpp	Tue Oct 07 08:37:30 2014 -0700
@@ -3960,7 +3960,6 @@
         DASSERT(stringCls);
         CHECK_NULL(stringCls);
         clauseReading = env->NewObjectArray(cClause, stringCls, NULL);
-        env->DeleteLocalRef(stringCls);
         DASSERT(clauseReading);
         CHECK_NULL(clauseReading);
         for (int i=0; i<cClause; i++)   env->SetObjectArrayElement(clauseReading, i, rgClauseReading[i]);