Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 10185:d20e9d18bdc1
Merge
author | asaha |
---|---|
date | Tue, 07 Oct 2014 15:04:41 -0700 |
parents | 69055f4e04d5 (current diff) 65e300d8a3d8 (diff) |
children | ea780a99f132 |
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 15:51:21 2014 -0700 +++ b/.hgtags Tue Oct 07 15:04:41 2014 -0700 @@ -333,6 +333,7 @@ 0000000000000000000000000000000000000000 jdk8u25-b16 d067890f970f3a712f870f6311d20f3359b6eaf0 jdk8u25-b16 67b22a82345bfa1ae1492679bdf3c4d54f4eacde jdk8u25-b17 +a4e88eaf15ea0569f3275a807a976fe0e04a086c jdk8u25-b18 e6ed015afbbf3459ba3297e270b4f3170e989c80 jdk8u40-b00 6e223d48080ef40f4ec11ecbcd19b4a20813b9eb jdk8u40-b01 4797cd0713b44b009525f1276d571ade7e24f3f5 jdk8u40-b02
--- a/src/windows/native/sun/windows/awt_Component.cpp Mon Oct 06 15:51:21 2014 -0700 +++ b/src/windows/native/sun/windows/awt_Component.cpp Tue Oct 07 15:04:41 2014 -0700 @@ -3955,7 +3955,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]);