diff options
Diffstat (limited to 'java/openjdk6/files/icedtea/security/20130201/7201066.patch')
-rw-r--r-- | java/openjdk6/files/icedtea/security/20130201/7201066.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/java/openjdk6/files/icedtea/security/20130201/7201066.patch b/java/openjdk6/files/icedtea/security/20130201/7201066.patch deleted file mode 100644 index 2a38f116a6f0..000000000000 --- a/java/openjdk6/files/icedtea/security/20130201/7201066.patch +++ /dev/null @@ -1,66 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1352217014 0 -# Node ID 58fdb67fcacc67693fc43b5601e88bd7c216f850 -# Parent 42b1142b39b5a511e1e07b5877cc55e93767064e -7201066: Change modifiers on unused fields -Reviewed-by: alanb, skoivu - -diff --git a/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java b/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java ---- corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java -+++ corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -322,9 +322,9 @@ class ServerCallback extends - com.sun.corba.se.spi.activation._ServerImplBase - { - private ORB orb; -- private Method installMethod ; -- private Method uninstallMethod ; -- private Method shutdownMethod ; -+ private transient Method installMethod ; -+ private transient Method uninstallMethod ; -+ private transient Method shutdownMethod ; - private Object methodArgs[] ; - - ServerCallback(ORB orb, Method installMethod, Method uninstallMethod, -diff --git a/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java b/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java ---- corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java -+++ corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java -@@ -1536,8 +1536,8 @@ public class ObjectStreamClass implement - private boolean hasExternalizableBlockData; - Method writeObjectMethod; - Method readObjectMethod; -- private Method writeReplaceObjectMethod; -- private Method readResolveObjectMethod; -+ private transient Method writeReplaceObjectMethod; -+ private transient Method readResolveObjectMethod; - private Constructor cons ; - - /** -diff --git a/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java b/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java ---- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java -+++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -1119,8 +1119,8 @@ public class ObjectStreamClass_1_3_1 imp - private boolean hasExternalizableBlockData; - Method writeObjectMethod; - Method readObjectMethod; -- private Method writeReplaceObjectMethod; -- private Method readResolveObjectMethod; -+ private transient Method writeReplaceObjectMethod; -+ private transient Method readResolveObjectMethod; - - /* - * ObjectStreamClass_1_3_1 that this one was built from. |