Mercurial > hg > release > icedtea6-1.6
view patches/openjdk/6909563-docs-rmi.patch @ 1738:3ac8e6470d4f
Backport upstream patches to fix warnings in documentation generation.
2010-07-21 Andrew John Hughes <ahughes@redhat.com>
Backport documentation patches to avoid documentation
errors.
* .hgignore: Remove broken openjdk regexp matching.
* Makefile.am: Add new patches.
* patches/openjdk/4891262-docs-accessibility.patch,
* patches/openjdk/6737212-docs-sql.patch,
* patches/openjdk/6875861-docs-properties.patch,
* patches/openjdk/6909563-docs-rmi.patch,
* patches/openjdk/6917485-docs-corba.patch,
* patches/openjdk/6921068-docs-specdefault.patch:
Fix warnings in producing documentation.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 21 Jul 2010 17:39:05 +0100 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User darcy # Date 1261419383 0 # Node ID 88557649e47f984d0412243232486534004c65af # Parent e321afbdc36669c231cd20cb2415b886c4e795e9 6909563: Javadoc build warnings in rmi, security, management Reviewed-by: mchung, mullan diff -r e321afbdc366 -r 88557649e47f src/share/classes/java/rmi/activation/Activatable.java --- openjdk.orig/jdk/src/share/classes/java/rmi/activation/Activatable.java Wed Sep 09 20:15:22 2009 -0400 +++ openjdk/jdk/src/share/classes/java/rmi/activation/Activatable.java Mon Dec 21 18:16:23 2009 +0000 @@ -73,7 +73,7 @@ * can be handled properly. * * <p>This method invokes the {@link - * exportObject(Remote,String,MarshalledObject,boolean,port) + * #exportObject(Remote,String,MarshalledObject,boolean,int) * exportObject} method with this object, and the specified location, * data, restart mode, and port. Subsequent calls to {@link #getID} * will return the activation identifier returned from the call to @@ -120,7 +120,7 @@ * can be handled properly. * * <p>This method invokes the {@link - * exportObject(Remote,String,MarshalledObject,boolean,port,RMIClientSocketFactory,RMIServerSocketFactory) + * #exportObject(Remote,String,MarshalledObject,boolean,int,RMIClientSocketFactory,RMIServerSocketFactory) * exportObject} method with this object, and the specified location, * data, restart mode, port, and client and server socket factories. * Subsequent calls to {@link #getID} will return the activation @@ -312,7 +312,7 @@ * separately, so that exceptions can be handled properly. * * <p>This method invokes the {@link - * exportObject(Remote,String,MarshalledObject,boolean,port,RMIClientSocketFactory,RMIServerSocketFactory) + * #exportObject(Remote,String,MarshalledObject,boolean,int,RMIClientSocketFactory,RMIServerSocketFactory) * exportObject} method with the specified object, location, data, * restart mode, and port, and <code>null</code> for both client and * server socket factories, and then returns the resulting activation diff -r e321afbdc366 -r 88557649e47f src/share/classes/java/rmi/registry/LocateRegistry.java --- openjdk.orig/jdk/src/share/classes/java/rmi/registry/LocateRegistry.java Wed Sep 09 20:15:22 2009 -0400 +++ openjdk/jdk/src/share/classes/java/rmi/registry/LocateRegistry.java Mon Dec 21 18:16:23 2009 +0000 @@ -187,7 +187,7 @@ * host that accepts requests on the specified <code>port</code>. * * <p>The <code>Registry</code> instance is exported as if the static - * {@link UnicastRemoteObject.exportObject(Remote,int) + * {@link UnicastRemoteObject#exportObject(Remote,int) * UnicastRemoteObject.exportObject} method is invoked, passing the * <code>Registry</code> instance and the specified <code>port</code> as * arguments, except that the <code>Registry</code> instance is @@ -213,7 +213,7 @@ * * <p>The <code>Registry</code> instance is exported as if * the static {@link - * UnicastRemoteObject.exportObject(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory) + * UnicastRemoteObject#exportObject(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory) * UnicastRemoteObject.exportObject} method is invoked, passing the * <code>Registry</code> instance, the specified <code>port</code>, the * specified <code>RMIClientSocketFactory</code>, and the specified diff -r e321afbdc366 -r 88557649e47f src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java --- openjdk.orig/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Wed Sep 09 20:15:22 2009 -0400 +++ openjdk/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Mon Dec 21 18:16:23 2009 +0000 @@ -138,7 +138,6 @@ * instance * @throws Throwable the exception to throw from the method invocation * on the proxy instance - * @see **/ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable