From 0ec40380239d59da6e1a9908dc0b23b2d759907f4be9de8d381bed78ed46346f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 15 Jul 2015 18:37:08 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=102

---
 aarch64-8035938.patch   | 27 ---------------------------
 java-1_8_0-openjdk.spec |  5 +----
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 aarch64-8035938.patch

diff --git a/aarch64-8035938.patch b/aarch64-8035938.patch
deleted file mode 100644
index f09cf58..0000000
--- a/aarch64-8035938.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# HG changeset patch
-# User kevinw
-# Date 1422481386 0
-# Node ID 62c4bd276cbe409c0cbc7632df1ed7eb33048fb3
-# Parent  9773891321c4267baf5fa067b6df4e83ff21b3a5
-8035938: Memory leak in JvmtiEnv::GetConstantPool
-Reviewed-by: sspitsyn, dcubed
-
-diff -r 9773891321c4 -r 62c4bd276cbe src/share/vm/prims/jvmtiClassFileReconstituter.hpp
---- jdk8/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp	Thu Apr 23 09:10:15 2015 -0700
-+++ jdk8/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.hpp	Wed Jan 28 21:43:06 2015 +0000
-@@ -68,11 +68,11 @@
- 
-   ~JvmtiConstantPoolReconstituter() {
-     if (_symmap != NULL) {
--      os::free(_symmap, mtClass);
-+      delete _symmap;
-       _symmap = NULL;
-     }
-     if (_classmap != NULL) {
--      os::free(_classmap, mtClass);
-+      delete _classmap;
-       _classmap = NULL;
-     }
-   }
-
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 9a980e7..3821c17 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -230,10 +230,8 @@ Patch16:        zero-dummy.patch
 # July 2015 security fixes backported to aarch64 hotspot
 # 8071731: Better scaling for C1
 Patch20:        aarch64-8071731.patch
-# 8035938: Memory leak in JvmtiEnv::GetConstantPool
-Patch21:        aarch64-8035938.patch
 # 8075838: Method for typing MethodTypes
-Patch22:        aarch64-8075838.patch
+Patch21:        aarch64-8075838.patch
 #
 # OpenJDK specific patches
 #
@@ -540,7 +538,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %ifarch %aarch64
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
 %endif
 
 %patch99 -p1