changeset 10400:b1cf98897adc

Merge
author asaha
date Tue, 07 Oct 2014 08:50:20 -0700
parents 1ecc234bd389 556c79ef8a1d
children 4581ed6af636
files .hgtags src/windows/native/sun/windows/awt_Component.cpp
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 06 14:11:37 2014 -0700
+++ b/.hgtags	Tue Oct 07 08:50:20 2014 -0700
@@ -335,6 +335,7 @@
 0000000000000000000000000000000000000000 jdk8u25-b16
 d067890f970f3a712f870f6311d20f3359b6eaf0 jdk8u25-b16
 67b22a82345bfa1ae1492679bdf3c4d54f4eacde jdk8u25-b17
+a4e88eaf15ea0569f3275a807a976fe0e04a086c jdk8u25-b18
 f935349e2c065487c745bc41f81ddc7869bd2d2d jdk8u31-b00
 caebf6158e9d522df41a2c89a1602e5013bac401 jdk8u31-b01
 b1cef4d76664564732004cf3aedb0cbaa1972683 jdk8u31-b02
--- a/src/windows/native/sun/windows/awt_Component.cpp	Mon Oct 06 14:11:37 2014 -0700
+++ b/src/windows/native/sun/windows/awt_Component.cpp	Tue Oct 07 08:50:20 2014 -0700
@@ -3965,7 +3965,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]);