diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-12-04 23:20:35 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-12-04 23:20:35 +0000 |
| commit | fffab58da85dfb88fe6dc70ab603b2d29b41cc1b (patch) | |
| tree | 8241b8a874c4cce2b9c0f9fba0552cd92b0c8d2d /java/openjdk6/files/icedtea/openjdk/oj6-21-overrides.patch | |
| parent | multimedia/ffmpeg0: temporary workaround for opencv issue (diff) | |
Add multiple security patches and improvements from IcedTea6.
http://icedtea.classpath.org/hg/icedtea6/rev/e98b0ef70b26
Obtained from: IcedTea Project
Notes
Notes:
svn path=/head/; revision=335646
Diffstat (limited to 'java/openjdk6/files/icedtea/openjdk/oj6-21-overrides.patch')
| -rw-r--r-- | java/openjdk6/files/icedtea/openjdk/oj6-21-overrides.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/java/openjdk6/files/icedtea/openjdk/oj6-21-overrides.patch b/java/openjdk6/files/icedtea/openjdk/oj6-21-overrides.patch new file mode 100644 index 000000000000..797a4f63f305 --- /dev/null +++ b/java/openjdk6/files/icedtea/openjdk/oj6-21-overrides.patch @@ -0,0 +1,20 @@ +# HG changeset patch +# User andrew +# Date 1383055466 0 +# Tue Oct 29 14:04:26 2013 +0000 +# Node ID 4a15d8b1c94aa5e5a9c61bbd0feb7a6727343927 +# Parent f587451cfca426297a5d9be67c7bfc36f1ad8e10 +OPENJDK6-21: Remove @Override annotation added on interface by 2013/10/15 security fixes +Reviewed-by: omajid + +diff -r f587451cfca4 -r 4a15d8b1c94a src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java +--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java Tue Oct 15 15:55:15 2013 +0100 ++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java Tue Oct 29 14:04:26 2013 +0000 +@@ -130,7 +130,6 @@ + new CustomCompositeInvocationHandlerImpl( stub ) ; + + AccessController.doPrivileged(new PrivilegedAction<Void>() { +- @Override + public Void run() { + handler.addInvocationHandler( DynamicStub.class, + dynamicStubHandler ) ; |