Mercurial > hg > openjdk > jdk6 > corba
changeset 100:295b9963b97f
OPENJDK6-25: Remove @Override annotation added on interfaces by 2014/01/14 security fixes
Summary: Code is built with source/target 1.5 so can't use @Override on interfaces
Reviewed-by: omajid
| author | andrew |
|---|---|
| date | Fri, 17 Jan 2014 23:21:27 +0000 |
| parents | 667af22c2464 |
| children | c93c49524d58 |
| files | src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java src/share/classes/sun/corba/EncapsInputStreamFactory.java |
| diffstat | 5 files changed, 0 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Fri Jan 17 17:36:44 2014 +0000 +++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Fri Jan 17 23:21:27 2014 +0000 @@ -87,7 +87,6 @@ .create_input_stream(); AnyInputStream aIS = AccessController .doPrivileged(new PrivilegedAction<AnyInputStream>() { - @Override public AnyInputStream run() { return new AnyInputStream( (com.sun.corba.se.impl.encoding.EncapsInputStream) is);
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java Fri Jan 17 17:36:44 2014 +0000 +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java Fri Jan 17 23:21:27 2014 +0000 @@ -38,7 +38,6 @@ { return AccessController .doPrivileged(new PrivilegedAction<StubFactoryProxyImpl>() { - @Override public StubFactoryProxyImpl run() { return new StubFactoryProxyImpl(classData, classLoader); }
--- a/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java Fri Jan 17 17:36:44 2014 +0000 +++ b/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java Fri Jan 17 23:21:27 2014 +0000 @@ -163,7 +163,6 @@ final Message inMsg = cdrOutputObject.getMessageHeader(); CDRInputObject cdrInputObject = AccessController .doPrivileged(new PrivilegedAction<CDRInputObject>() { - @Override public CDRInputObject run() { return new CDRInputObject(inOrb, null, inBuffer, inMsg); @@ -206,7 +205,6 @@ final Message inMsg2 = cdrOutputObject.getMessageHeader(); cdrInputObject = AccessController .doPrivileged(new PrivilegedAction<CDRInputObject>() { - @Override public CDRInputObject run() { return new CDRInputObject(inOrb2, null, inBuffer2, inMsg2);
--- a/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Fri Jan 17 17:36:44 2014 +0000 +++ b/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Fri Jan 17 23:21:27 2014 +0000 @@ -52,7 +52,6 @@ private static final boolean allowSubclass = AccessController.doPrivileged( new PrivilegedAction<Boolean>() { - @Override public Boolean run() { String prop = System.getProperty(ALLOW_SUBCLASS_PROP); return prop == null ? false :
--- a/src/share/classes/sun/corba/EncapsInputStreamFactory.java Fri Jan 17 17:36:44 2014 +0000 +++ b/src/share/classes/sun/corba/EncapsInputStreamFactory.java Fri Jan 17 23:21:27 2014 +0000 @@ -44,7 +44,6 @@ final boolean littleEndian, final GIOPVersion version) { return AccessController .doPrivileged(new PrivilegedAction<EncapsInputStream>() { - @Override public EncapsInputStream run() { return new EncapsInputStream(orb, buf, size, littleEndian, version); @@ -58,7 +57,6 @@ final GIOPVersion version) { return AccessController .doPrivileged(new PrivilegedAction<EncapsInputStream>() { - @Override public EncapsInputStream run() { return new EncapsInputStream(orb, byteBuffer, size, littleEndian, version); @@ -70,7 +68,6 @@ final org.omg.CORBA.ORB orb, final byte[] data, final int size) { return AccessController .doPrivileged(new PrivilegedAction<EncapsInputStream>() { - @Override public EncapsInputStream run() { return new EncapsInputStream(orb, data, size); } @@ -81,7 +78,6 @@ final EncapsInputStream eis) { return AccessController .doPrivileged(new PrivilegedAction<EncapsInputStream>() { - @Override public EncapsInputStream run() { return new EncapsInputStream(eis); } @@ -93,7 +89,6 @@ final GIOPVersion version) { return AccessController .doPrivileged(new PrivilegedAction<EncapsInputStream>() { - @Override public EncapsInputStream run() { return new EncapsInputStream(orb, data, size, version); } @@ -105,7 +100,6 @@ final GIOPVersion version, final CodeBase codeBase) { return AccessController .doPrivileged(new PrivilegedAction<EncapsInputStream>() { - @Override public EncapsInputStream run() { return new EncapsInputStream(orb, data, size, version, codeBase); @@ -118,7 +112,6 @@ final boolean littleEndian, final GIOPVersion version) { return AccessController .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() { - @Override public TypeCodeInputStream run() { return new TypeCodeInputStream(orb, buf, size, littleEndian, version); @@ -132,7 +125,6 @@ final GIOPVersion version) { return AccessController .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() { - @Override public TypeCodeInputStream run() { return new TypeCodeInputStream(orb, byteBuffer, size, littleEndian, version); @@ -144,7 +136,6 @@ final org.omg.CORBA.ORB orb, final byte[] data, final int size) { return AccessController .doPrivileged(new PrivilegedAction<TypeCodeInputStream>() { - @Override public TypeCodeInputStream run() { return new TypeCodeInputStream(orb, data, size); }