. Update to build 27.

Feature safe:	yes

1 files changed, 0 insertions, 55 deletions

diff --git a/java/openjdk6/files/icedtea/security/7189490.patch b/java/openjdk6/files/icedtea/security/7189490.patch
deleted file mode 100644
index 3a8826dde48e..000000000000
--- a/java/openjdk6/files/icedtea/security/7189490.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-# HG changeset patch
-# User coffeys
-# Date 1345121553 -3600
-# Node ID 7fe230af5036c83eb337b3560821b97c6dec08c9
-# Parent  b6a7a661db8a2141ebb2e79ba5739722d1be7bfd
-7189490: More improvements to DomainCombiner checking
-Reviewed-by: mullan
-
-diff --git a/src/share/classes/java/security/AccessController.java b/src/share/classes/java/security/AccessController.java
---- jdk/src/share/classes/java/security/AccessController.java
-+++ jdk/src/share/classes/java/security/AccessController.java
-@@ -290,11 +290,11 @@
-      */
-     public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action) {
- 
--        DomainCombiner dc = null;
-         AccessControlContext acc = getStackAccessControlContext();
--        if (acc == null || (dc = acc.getAssignedCombiner()) == null) {
--            return AccessController.doPrivileged(action, acc);
-+        if (acc == null) {
-+            return AccessController.doPrivileged(action);
-         }
-+        DomainCombiner dc = acc.getAssignedCombiner();
-         return AccessController.doPrivileged(action, preserveCombiner(dc));
-     }
- 
-@@ -386,11 +386,11 @@
-     public static <T> T doPrivilegedWithCombiner
-         (PrivilegedExceptionAction<T> action) throws PrivilegedActionException {
- 
--        DomainCombiner dc = null;
-         AccessControlContext acc = getStackAccessControlContext();
--        if (acc == null || (dc = acc.getAssignedCombiner()) == null) {
--            return AccessController.doPrivileged(action, acc);
-+        if (acc == null) {
-+            return AccessController.doPrivileged(action);
-         }
-+        DomainCombiner dc = acc.getAssignedCombiner();
-         return AccessController.doPrivileged(action, preserveCombiner(dc));
-     }
- 
-@@ -417,7 +417,12 @@
-         // perform 'combine' on the caller of doPrivileged,
-         // even if the caller is from the bootclasspath
-         ProtectionDomain[] pds = new ProtectionDomain[] {callerPd};
--        return new AccessControlContext(combiner.combine(pds, null), combiner);
-+        if (combiner == null) {
-+            return new AccessControlContext(pds);
-+        } else {
-+            return new AccessControlContext(combiner.combine(pds, null),
-+                                            combiner);
-+        }
-     }
- 
-