Mercurial > hg > release > icedtea6-1.13

changeset 3253:24ce0141709b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java 2016-05-13 Andrew John Hughes <gnu.andrew@redhat.com> PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java * NEWS: Updated. * patches/ecj/override.patch: Add cases in RMIJRMPServerImpl and others which show up when source/target 5 is used in the rt-class-files pre-build. * patches/openjdk/8014205-blank_swing_dialogs_windows.patch: Remove addition of @Override.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 14 Jun 2016 07:56:05 +0100
parents e54ba13945f0
children c1f3d7105545
files ChangeLog NEWS patches/ecj/override.patch patches/openjdk/8014205-blank_swing_dialogs_windows.patch
diffstat 4 files changed, 253 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun May 08 21:22:46 2016 +0100
+++ b/ChangeLog	Tue Jun 14 07:56:05 2016 +0100
@@ -1,3 +1,15 @@
+2016-05-13  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	PR2954: ecj/override.patch is missing new
+	@Overrides in RMIJRMPServerImpl.java
+	* NEWS: Updated.
+	* patches/ecj/override.patch:
+	Add cases in RMIJRMPServerImpl and others
+	which show up when source/target 5 is
+	used in the rt-class-files pre-build.
+	* patches/openjdk/8014205-blank_swing_dialogs_windows.patch:
+	Remove addition of @Override.
+
 2016-05-08  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* NEWS: Add 1.13.12 section.
--- a/NEWS	Sun May 08 21:22:46 2016 +0100
+++ b/NEWS	Tue Jun 14 07:56:05 2016 +0100
@@ -14,6 +14,9 @@
 
 New in release 1.13.12 (2016-07-XX):
 
+* Bug fixes
+  - PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
+
 New in release 1.13.11 (2016-05-05):
 
 * Security fixes
--- a/patches/ecj/override.patch	Sun May 08 21:22:46 2016 +0100
+++ b/patches/ecj/override.patch	Tue Jun 14 07:56:05 2016 +0100
@@ -362,3 +362,240 @@
              public Class<?> run() {
                  try {
                      ReflectUtil.checkPackageAccess(className);
+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java	Thu May 12 01:30:54 2016 +0100
+@@ -1870,7 +1870,6 @@
+ 
+     private ModifiableClassLoaderRepository getInstantiatorCLR() {
+         return AccessController.doPrivileged(new PrivilegedAction<ModifiableClassLoaderRepository>() {
+-            @Override
+             public ModifiableClassLoaderRepository run() {
+                 return instantiator != null ? instantiator.getClassLoaderRepository() : null;
+             }
+diff -r 545db1dd8c2a src/share/classes/com/sun/media/sound/Platform.java
+--- openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/Platform.java	Thu May 12 01:30:54 2016 +0100
+@@ -160,7 +160,6 @@
+         try {
+             // load the main library
+             AccessController.doPrivileged(new PrivilegedAction<Void>() {
+-                @Override
+                 public Void run() {
+                     System.loadLibrary(libNameMain);
+                     return null;
+@@ -182,7 +181,6 @@
+             final String lib = st.nextToken();
+             try {
+                 AccessController.doPrivileged(new PrivilegedAction<Void>() {
+-                    @Override
+                     public Void run() {
+                         System.loadLibrary(lib);
+                         return null;
+diff -r 545db1dd8c2a src/share/classes/java/awt/EventQueue.java
+--- openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/awt/EventQueue.java	Thu May 12 01:30:54 2016 +0100
+@@ -190,7 +190,6 @@
+                     EventQueue.invokeAndWait(source, r);
+                 }
+ 
+-                @Override
+                 public long getMostRecentEventTime(EventQueue eventQueue) {
+                     return eventQueue.getMostRecentEventTimeImpl();
+                 }
+diff -r 545db1dd8c2a src/share/classes/java/io/ObjectInputStream.java
+--- openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/io/ObjectInputStream.java	Thu May 12 01:30:54 2016 +0100
+@@ -3571,7 +3571,6 @@
+     }
+     static {
+         SharedSecrets.setJavaObjectInputStreamAccess(new JavaObjectInputStreamAccess() {
+-            @Override
+             public void setValidator(ObjectInputStream ois, ObjectStreamClassValidator validator) {
+                 ObjectInputStream.setValidator(ois, validator);
+             }
+diff -r 545db1dd8c2a src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
+--- openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java	Thu May 12 01:30:54 2016 +0100
+@@ -64,7 +64,6 @@
+         final String propName = "sun.rmi.server.invocationhandler.allowFinalizeInvocation";
+         String allowProp = java.security.AccessController.doPrivileged(
+             new PrivilegedAction<String>() {
+-                @Override
+                 public String run() {
+                     return System.getProperty(propName);
+                 }
+diff -r 545db1dd8c2a src/share/classes/sun/awt/image/SunVolatileImage.java
+--- openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java	Thu May 12 01:30:54 2016 +0100
+@@ -262,7 +262,6 @@
+      *
+      * @see sun.java2d.DestSurfaceProvider#getDestSurface
+      */
+-    @Override
+     public Surface getDestSurface() {
+         return volSurfaceManager.getPrimarySurfaceData();
+     }
+diff -r 545db1dd8c2a src/share/classes/sun/java2d/SunGraphics2D.java
+--- openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/java2d/SunGraphics2D.java	Thu May 12 01:30:54 2016 +0100
+@@ -3294,7 +3294,6 @@
+      *
+      * @see sun.java2d.DestSurfaceProvider#getDestSurface
+      */
+-    @Override
+     public Surface getDestSurface() {
+         return surfaceData;
+     }
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/server/UnicastServerRef.java
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java	Thu May 12 01:30:54 2016 +0100
+@@ -630,12 +630,10 @@
+             this.callID = callID;
+         }
+ 
+-        @Override
+         public void validateDescriptor(ObjectStreamClass descriptor) {
+             descriptorCheck.check(method, descriptor, parameterIndex, callID);
+         }
+ 
+-        @Override
+         public void checkProxyInterfaceNames(String[] ifaces) {
+             descriptorCheck.checkProxyClass(method, ifaces, parameterIndex, callID);
+         }
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/Transport.java
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/Transport.java	Thu May 12 01:30:54 2016 +0100
+@@ -133,7 +133,6 @@
+      */
+     private static void setContextClassLoader(final ClassLoader ccl) {
+         AccessController.doPrivileged(new PrivilegedAction<Void> () {
+-                @Override
+                 public Void run() {
+                     Thread.currentThread().setContextClassLoader(ccl);
+                     return null;
+diff -r 545db1dd8c2a src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+--- openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	Thu May 12 01:30:54 2016 +0100
+@@ -676,7 +676,6 @@
+                           connectionCount.incrementAndGet() +
+                           ")-" + remoteHost);
+                 AccessController.doPrivileged(new PrivilegedAction<Void>() {
+-                    @Override
+                     public Void run() {
+                         run0();
+                         return null;
+diff -r 545db1dd8c2a src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java
+--- openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java	Thu May 12 01:30:54 2016 +0100
+@@ -92,7 +92,6 @@
+         return this;
+     }
+ 
+-    @Override
+     public SurfaceData createManagedSurface(int w, int h, int transparency) {
+         return GLXSurfaceData.createData(this, w, h,
+                                          getColorModel(transparency),
+@@ -165,12 +164,10 @@
+      * Returns true if the provided capability bit is present for this config.
+      * See OGLContext.java for a list of supported capabilities.
+      */
+-    @Override
+     public final boolean isCapPresent(int cap) {
+         return ((oglCaps.getCaps() & cap) != 0);
+     }
+ 
+-    @Override
+     public final long getNativeConfigInfo() {
+         return pConfigInfo;
+     }
+@@ -180,7 +177,6 @@
+      *
+      * @see sun.java2d.pipe.hw.BufferedContextProvider#getContext
+      */
+-    @Override
+     public final OGLContext getContext() {
+         return context;
+     }
+@@ -394,7 +390,6 @@
+      *
+      * @see sun.java2d.pipe.hw.AccelGraphicsConfig#createCompatibleVolatileImage
+      */
+-    @Override
+     public VolatileImage
+         createCompatibleVolatileImage(int width, int height,
+                                       int transparency, int type)
+@@ -434,17 +429,14 @@
+      *
+      * @see sun.java2d.pipe.hw.AccelGraphicsConfig#getContextCapabilities
+      */
+-    @Override
+     public ContextCapabilities getContextCapabilities() {
+         return oglCaps;
+     }
+ 
+-    @Override
+     public void addDeviceEventListener(AccelDeviceEventListener l) {
+         AccelDeviceEventNotifier.addListener(l, screen.getScreen());
+     }
+ 
+-    @Override
+     public void removeDeviceEventListener(AccelDeviceEventListener l) {
+         AccelDeviceEventNotifier.removeListener(l);
+     }
+diff -r 545db1dd8c2a src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
+--- openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java	Wed May 04 23:23:55 2016 +0100
++++ openjdk-ecj/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java	Thu May 12 01:51:42 2016 +0100
+@@ -236,7 +236,6 @@
+         final MBeanInstantiator fInstantiator = instantiator;
+         this.secureClr = new
+             SecureClassLoaderRepository(AccessController.doPrivileged(new PrivilegedAction<ClassLoaderRepository>() {
+-                @Override
+                 public ClassLoaderRepository run() {
+                     return fInstantiator.getClassLoaderRepository();
+                 }
+@@ -1257,7 +1256,6 @@
+         ClassLoader myLoader = outerShell.getClass().getClassLoader();
+         final ModifiableClassLoaderRepository loaders = AccessController.doPrivileged(new PrivilegedAction<ModifiableClassLoaderRepository>() {
+ 
+-            @Override
+             public ModifiableClassLoaderRepository run() {
+                 return instantiator.getClassLoaderRepository();
+             }
+diff -r b72e7b89dda9 src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
+--- openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java	Thu Sep 08 11:00:33 2011 -0700
++++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java	Thu May 12 16:39:37 2016 +0100
+@@ -227,17 +227,14 @@
+             allowedTypes = credentialsTypes;
+         }
+ 
+-        @Override
+         public String getVersion() throws RemoteException {
+             return impl.getVersion();
+         }
+ 
+-        @Override
+         public RMIConnection newClient(Object credentials) throws IOException {
+             return impl.newClient(credentials);
+         }
+ 
+-        @Override
+         public void check(Method method, ObjectStreamClass descriptor,
+                 int paramIndex, int callID) {
+ 
+@@ -247,7 +244,6 @@
+             }
+         }
+ 
+-        @Override
+         public void checkProxyClass(Method method, String[] ifaces,
+                 int paramIndex, int callID) {
+             if (ifaces != null && ifaces.length > 0) {
+@@ -259,7 +255,6 @@
+             }
+         }
+ 
+-        @Override
+         public void end(int callID) {
+             /* Do nothing */
+         }
--- a/patches/openjdk/8014205-blank_swing_dialogs_windows.patch	Sun May 08 21:22:46 2016 +0100
+++ b/patches/openjdk/8014205-blank_swing_dialogs_windows.patch	Tue Jun 14 07:56:05 2016 +0100
@@ -116,7 +116,7 @@
              {
                  if (numBands == 3 && !ccm.hasAlpha()) {
                      imageType = TYPE_3BYTE_BGR;
-@@ -804,6 +801,27 @@
+@@ -804,6 +801,26 @@
          }   // else if ((raster instanceof ByteComponentRaster) &&
      }
  
@@ -129,7 +129,6 @@
 +                new PrivilegedAction<Boolean>()
 +        {
 +
-+            @Override
 +            public Boolean run() {
 +                final ClassLoader std = System.class.getClassLoader();
 +