{@code MessageInfo} instances are not safe for use by multiple concurrent * threads. If a MessageInfo is to be used by more than one thread then access diff --git a/jdk/src/share/classes/com/sun/nio/sctp/Notification.java b/jdk/src/share/classes/com/sun/nio/sctp/Notification.java index cc23b8f2e47..2436fae7ba7 100644 --- a/jdk/src/share/classes/com/sun/nio/sctp/Notification.java +++ b/jdk/src/share/classes/com/sun/nio/sctp/Notification.java @@ -40,6 +40,8 @@ package com.sun.nio.sctp; public interface Notification { /** * Returns the association that this notification is applicable to. + * + * @return The association */ public Association association(); } diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java index 0b351a4ca3f..22cf07650f4 100644 --- a/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java +++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java @@ -59,7 +59,7 @@ import java.nio.channels.SelectionKey; * {@link #setOption(SctpSocketOption,Object) setOption} method. An SCTP * channel support the following options: *
- *+ *
*
* Option Name *Description @@ -636,6 +636,9 @@ public abstract class SctpChannel /** * Returns the value of a socket option. * + * @param+ * The type of the socket option value + * * @param name * The socket option * @@ -659,6 +662,9 @@ public abstract class SctpChannel /** * Sets the value of a socket option. * + * @param + * The type of the socket option value + * * @param name * The socket option * @@ -752,6 +758,9 @@ public abstract class SctpChannel * the {@code receive} method of this channel, if it does an * {@link IllegalReceiveException} will be thrown. * + * @param + * The type of the attachment + * * @param dst * The buffer into which message bytes are to be transferred * @@ -831,7 +840,7 @@ public abstract class SctpChannel * there was insufficient room for the message in the underlying * output buffer * - * @throws InvalidStreamExcepton + * @throws InvalidStreamException * If {@code streamNumner} is negative or greater than or equal to * the maximum number of outgoing streams * diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java index f8745dba41e..42e56591e43 100644 --- a/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java +++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java @@ -63,7 +63,7 @@ import java.nio.channels.SelectionKey; * {@link #setOption(SctpSocketOption,Object,Association) setOption} method. An * {@code SctpMultiChannel} supports the following options: * - *+ *
*
* Option Name *Description @@ -394,6 +394,9 @@ public abstract class SctpMultiChannel * Returns all of the remote addresses to which the given association on * this channel's socket is connected. * + * @param association + * The association + * * @return All of the remote addresses for the given association, or * an empty {@code Set} if the association has been shutdown * @@ -431,6 +434,9 @@ public abstract class SctpMultiChannel * ignored if given. However, if the option is association specific then the * association must be given. * + * @param+ * The type of the socket option value + * * @param name * The socket option * @@ -464,6 +470,9 @@ public abstract class SctpMultiChannel * ignored if given. However, if the option is association specific then the * association must be given. * + * @param + * The type of the socket option value + * * @param name * The socket option * @@ -567,6 +576,9 @@ public abstract class SctpMultiChannel * the {@code receive} method of this channel, if it does an * {@link IllegalReceiveException} will be thrown. * + * @param + * The type of the attachment + * * @param buffer * The buffer into which bytes are to be transferred * @@ -673,7 +685,7 @@ public abstract class SctpMultiChannel * there was insufficient room for the message in the underlying * output buffer * - * @throws InvalidStreamExcepton + * @throws InvalidStreamException * If {@code streamNumber} is negative, or if an association already * exists and {@code streamNumber} is greater than the maximum number * of outgoing streams diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java index 637df72d394..c96e516ca4d 100644 --- a/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java +++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java @@ -47,7 +47,7 @@ import java.nio.channels.spi.AbstractSelectableChannel; * {@link #setOption(SctpSocketOption,Object) setOption} method. SCTP server socket * channels support the following options: * - *+ *
*
* Option Name *Description @@ -345,6 +345,9 @@ public abstract class SctpServerChannel /** * Returns the value of a socket option. * + * @param+ * The type of the socket option value + * * @param name * The socket option * @@ -367,6 +370,9 @@ public abstract class SctpServerChannel /** * Sets the value of a socket option. * + * @param + * The type of the socket option value + * * @param name * The socket option * diff --git a/jdk/src/share/classes/java/lang/Class.java b/jdk/src/share/classes/java/lang/Class.java index b8af59b7ae5..f884f2efe03 100644 --- a/jdk/src/share/classes/java/lang/Class.java +++ b/jdk/src/share/classes/java/lang/Class.java @@ -821,6 +821,10 @@ public final class Class implements java.io.Serializable, * If this object represents a primitive type or void, the method * returns an array of length 0. * + *
If this {@code Class} object represents an array type, the + * interfaces {@code Cloneable} and {@code java.io.Serializable} are + * returned in that order. + * * @return an array of interfaces implemented by this class. */ public Class[] getInterfaces() { @@ -1500,7 +1504,7 @@ public final class Class
implements java.io.Serializable, * If this {@code Class} object represents an array type, a primitive * type, or void, then this method returns an array of length 0. * - *
The elements in the array returned are not sorted and are not in any + *
The elements in the returned array are not sorted and are not in any * particular order. * * @return the array of {@code Field} objects representing the @@ -1525,23 +1529,33 @@ public final class Class
implements java.io.Serializable, /** - * Returns an array containing {@code Method} objects reflecting all - * the public member methods of the class or interface represented - * by this {@code Class} object, including those declared by the class - * or interface and those inherited from superclasses and - * superinterfaces. Array classes return all the (public) member methods - * inherited from the {@code Object} class. The elements in the array - * returned are not sorted and are not in any particular order. This - * method returns an array of length 0 if this {@code Class} object - * represents a class or interface that has no public member methods, or if - * this {@code Class} object represents a primitive type or void. + * Returns an array containing {@code Method} objects reflecting all the + * public methods of the class or interface represented by this {@code + * Class} object, including those declared by the class or interface and + * those inherited from superclasses and superinterfaces. * - * The class initialization method {@code
} is not - * included in the returned array. If the class declares multiple public - * member methods with the same parameter types, they are all included in - * the returned array. + * If this {@code Class} object represents a type that has multiple + * public methods with the same name and parameter types, but different + * return types, then the returned array has a {@code Method} object for + * each such method. * - *
See The Java Language Specification, sections 8.2 and 8.4. + *
If this {@code Class} object represents a type with a class + * initialization method {@code
}, then the returned array does + * not have a corresponding {@code Method} object. + * + * If this {@code Class} object represents an array type, then the + * returned array has a {@code Method} object for each of the public + * methods inherited by the array type from {@code Object}. It does not + * contain a {@code Method} object for {@code clone()}. + * + *
If this {@code Class} object represents a class or interface with no + * public methods, then the returned array has length 0. + * + *
If this {@code Class} object represents a primitive type or void, + * then the returned array has length 0. + * + *
The elements in the returned array are not sorted and are not in any + * particular order. * * @return the array of {@code Method} objects representing the * public methods of this class @@ -1553,6 +1567,8 @@ public final class Class
implements java.io.Serializable, * s.checkPackageAccess()} denies access to the package * of this class. * + * @jls 8.2 Class Members + * @jls 8.4 Method Declarations * @since JDK1.1 */ @CallerSensitive @@ -1693,7 +1709,8 @@ public final class Class implements java.io.Serializable, * method and the method being overridden would have the same * signature but different return types. * - * See The Java Language Specification, sections 8.2 and 8.4. + *
If this {@code Class} object represents an array type, then this + * method does not find the {@code clone()} method. * * @param name the name of the method * @param parameterTypes the list of parameters @@ -1710,6 +1727,8 @@ public final class Class
implements java.io.Serializable, * s.checkPackageAccess()} denies access to the package * of this class. * + * @jls 8.2 Class Members + * @jls 8.4 Method Declarations * @since JDK1.1 */ @CallerSensitive @@ -1815,7 +1834,7 @@ public final class Class implements java.io.Serializable, * If this {@code Class} object represents an array type, a primitive * type, or void, then this method returns an array of length 0. * - *
The elements in the array returned are not sorted and are not in any + *
The elements in the returned array are not sorted and are not in any * particular order. * * @return the array of {@code Field} objects representing all the @@ -1853,20 +1872,29 @@ public final class Class
implements java.io.Serializable, /** - * Returns an array of {@code Method} objects reflecting all the - * methods declared by the class or interface represented by this - * {@code Class} object. This includes public, protected, default - * (package) access, and private methods, but excludes inherited methods. - * The elements in the array returned are not sorted and are not in any - * particular order. This method returns an array of length 0 if the class - * or interface declares no methods, or if this {@code Class} object - * represents a primitive type, an array class, or void. The class - * initialization method {@code } is not included in the - * returned array. If the class declares multiple public member methods - * with the same parameter types, they are all included in the returned - * array. * - * See The Java Language Specification, section 8.2. + * Returns an array containing {@code Method} objects reflecting all the + * declared methods of the class or interface represented by this {@code + * Class} object, including public, protected, default (package) + * access, and private methods, but excluding inherited methods. + * + *
If this {@code Class} object represents a type that has multiple + * declared methods with the same name and parameter types, but different + * return types, then the returned array has a {@code Method} object for + * each such method. + * + *
If this {@code Class} object represents a type that has a class + * initialization method {@code
}, then the returned array does + * not have a corresponding {@code Method} object. + * + * If this {@code Class} object represents a class or interface with no + * declared methods, then the returned array has length 0. + * + *
If this {@code Class} object represents an array type, a primitive + * type, or void, then the returned array has length 0. + * + *
The elements in the returned array are not sorted and are not in any + * particular order. * * @return the array of {@code Method} objects representing all the * declared methods of this class @@ -1891,6 +1919,8 @@ public final class Class
implements java.io.Serializable, * * * + * @jls 8.2 Class Members + * @jls 8.4 Method Declarations * @since JDK1.1 */ @CallerSensitive @@ -2011,6 +2041,9 @@ public final class Class implements java.io.Serializable, * name is "<init>"or "<clinit>" a {@code NoSuchMethodException} * is raised. * + * If this {@code Class} object represents an array type, then this + * method does not find the {@code clone()} method. + * * @param name the name of the method * @param parameterTypes the parameter array * @return the {@code Method} object for the method of this class @@ -2038,6 +2071,8 @@ public final class Class
implements java.io.Serializable, * * * + * @jls 8.2 Class Members + * @jls 8.4 Method Declarations * @since JDK1.1 */ @CallerSensitive diff --git a/jdk/src/share/classes/java/lang/reflect/Executable.java b/jdk/src/share/classes/java/lang/reflect/Executable.java index aa8820fd2d7..9d41a0217db 100644 --- a/jdk/src/share/classes/java/lang/reflect/Executable.java +++ b/jdk/src/share/classes/java/lang/reflect/Executable.java @@ -428,20 +428,32 @@ public abstract class Executable extends AccessibleObject } /** - * Returns an array of arrays that represent the annotations on - * the formal parameters, in declaration order, of the executable - * represented by this object. (Returns an array of length zero if - * the underlying executable is parameterless. If the executable has - * one or more parameters, a nested array of length zero is - * returned for each parameter with no annotations.) The - * annotation objects contained in the returned arrays are - * serializable. The caller of this method is free to modify the - * returned arrays; it will have no effect on the arrays returned - * to other callers. + * Returns an array of arrays of {@code Annotation}s that + * represent the annotations on the formal parameters, in + * declaration order, of the {@code Executable} represented by + * this object. Synthetic and mandated parameters (see + * explanation below), such as the outer "this" parameter to an + * inner class constructor will be represented in the returned + * array. If the executable has no parameters (meaning no formal, + * no synthetic, and no mandated parameters), a zero-length array + * will be returned. If the {@code Executable} has one or more + * parameters, a nested array of length zero is returned for each + * parameter with no annotations. The annotation objects contained + * in the returned arrays are serializable. The caller of this + * method is free to modify the returned arrays; it will have no + * effect on the arrays returned to other callers. * - * @return an array of arrays that represent the annotations on the formal - * parameters, in declaration order, of the executable represented by this - * object + * A compiler may add extra parameters that are implicitly + * declared in source ("mandated"), as well as parameters that + * are neither implicitly nor explicitly declared in source + * ("synthetic") to the parameter list for a method. See {@link + * java.lang.reflect.Parameter} for more information. + * + * @see java.lang.reflect.Parameter + * @see java.lang.reflect.Parameter#getAnnotations + * @return an array of arrays that represent the annotations on + * the formal and implicit parameters, in declaration order, of + * the executable represented by this object */ public abstract Annotation[][] getParameterAnnotations(); diff --git a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java index be9ac509731..446b4248a8e 100644 --- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java +++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java @@ -719,7 +719,3 @@ abstract class AbstractPlainSocketImpl extends SocketImpl public final static int SHUT_RD = 0; public final static int SHUT_WR = 1; } - -class InetAddressContainer { - InetAddress addr; -} diff --git a/jdk/src/share/classes/java/net/InetAddressContainer.java b/jdk/src/share/classes/java/net/InetAddressContainer.java new file mode 100644 index 00000000000..28b64022fc7 --- /dev/null +++ b/jdk/src/share/classes/java/net/InetAddressContainer.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2013, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package java.net; + +class InetAddressContainer { + InetAddress addr; +} diff --git a/jdk/src/share/classes/java/rmi/activation/Activatable.java b/jdk/src/share/classes/java/rmi/activation/Activatable.java index 7b43c27bd22..6ab4ba22481 100644 --- a/jdk/src/share/classes/java/rmi/activation/Activatable.java +++ b/jdk/src/share/classes/java/rmi/activation/Activatable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -93,6 +93,8 @@ public abstract class Activatable extends RemoteServer { * @exception RemoteException if either of the following fails: * a) registering the object with the activation system or b) exporting * the object to the RMI runtime. + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation. * @since 1.2 **/ protected Activatable(String location, @@ -143,6 +145,8 @@ public abstract class Activatable extends RemoteServer { * @exception RemoteException if either of the following fails: * a) registering the object with the activation system or b) exporting * the object to the RMI runtime. + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation. * @since 1.2 **/ protected Activatable(String location, @@ -175,6 +179,8 @@ public abstract class Activatable extends RemoteServer { * @param port the port number on which the object is exported * @exception RemoteException if exporting the object to the RMI * runtime fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ protected Activatable(ActivationID id, int port) @@ -206,6 +212,8 @@ public abstract class Activatable extends RemoteServer { * @param ssf the server-side socket factory for receiving remote calls * @exception RemoteException if exporting the object to the RMI * runtime fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ protected Activatable(ActivationID id, int port, @@ -239,6 +247,8 @@ public abstract class Activatable extends RemoteServer { * is not registered with the activation system * @exception ActivationException if activation system is not running * @exception RemoteException if remote call fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public static Remote register(ActivationDesc desc) @@ -273,6 +283,8 @@ public abstract class Activatable extends RemoteServer { * already be inactive) * @exception ActivationException if group is not active * @exception RemoteException if call informing monitor fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public static boolean inactive(ActivationID id) @@ -290,6 +302,8 @@ public abstract class Activatable extends RemoteServer { * @exception UnknownObjectException if object ( id) is unknown * @exception ActivationException if activation system is not running * @exception RemoteException if remote call to activation system fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public static void unregister(ActivationID id) @@ -334,6 +348,8 @@ public abstract class Activatable extends RemoteServer { * the wrong group * @exception ActivationException if activation group is not active * @exception RemoteException if object registration or export fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 **/ public static ActivationID exportObject(Remote obj, @@ -407,6 +423,8 @@ public abstract class Activatable extends RemoteServer { * descriptor with the activation system * @exception ActivationException if activation group is not active * @exception RemoteException if object registration or export fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 **/ public static ActivationID exportObject(Remote obj, @@ -473,6 +491,8 @@ public abstract class Activatable extends RemoteServer { * @param port the port on which the object is exported (an anonymous * port is used if port=0) * @exception RemoteException if object export fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public static Remote exportObject(Remote obj, @@ -503,6 +523,8 @@ public abstract class Activatable extends RemoteServer { * remote object * @param ssf the server-side socket factory for receiving remote calls * @exception RemoteException if object export fails + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public static Remote exportObject(Remote obj, @@ -531,6 +553,8 @@ public abstract class Activatable extends RemoteServer { * @return true if operation is successful, false otherwise * @exception NoSuchObjectException if the remote object is not * currently exported + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public static boolean unexportObject(Remote obj, boolean force) diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationDesc.java b/jdk/src/share/classes/java/rmi/activation/ActivationDesc.java index d206337f70f..e9170294d05 100644 --- a/jdk/src/share/classes/java/rmi/activation/ActivationDesc.java +++ b/jdk/src/share/classes/java/rmi/activation/ActivationDesc.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -105,6 +105,8 @@ public final class ActivationDesc implements Serializable { * @param data the object's initialization (activation) data contained * in marshalled form. * @exception ActivationException if the current group is nonexistent + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public ActivationDesc(String className, @@ -142,6 +144,8 @@ public final class ActivationDesc implements Serializable { *truedoes not force an initial immediate activation of * a newly registered object; initial activation is lazy. * @exception ActivationException if the current group is nonexistent + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public ActivationDesc(String className, @@ -176,6 +180,8 @@ public final class ActivationDesc implements Serializable { * @param data the object's initialization (activation) data contained * in marshalled form. * @exception IllegalArgumentException ifgroupIDis null + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public ActivationDesc(ActivationGroupID groupID, @@ -208,6 +214,8 @@ public final class ActivationDesc implements Serializable { *truedoes not force an initial immediate activation of * a newly registered object; initial activation is lazy. * @exception IllegalArgumentException ifgroupIDis null + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public ActivationDesc(ActivationGroupID groupID, diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java b/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java index 28d41c25b3f..49dffd18e0e 100644 --- a/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java +++ b/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -133,6 +133,8 @@ public abstract class ActivationGroup * * @param groupID the group's identifier * @throws RemoteException if this group could not be exported + * @throws UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ protected ActivationGroup(ActivationGroupID groupID) @@ -267,6 +269,8 @@ public abstract class ActivationGroup * (Note: The default implementation of the security manager *checkSetFactory* method requires the RuntimePermission "setFactory") + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @see SecurityManager#checkSetFactory * @since 1.2 */ @@ -345,6 +349,8 @@ public abstract class ActivationGroup /** * Returns the current activation group's identifier. Returns null * if no group is currently active for this VM. + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @return the activation group's identifier * @since 1.2 */ @@ -394,6 +400,8 @@ public abstract class ActivationGroup * (Note: The default implementation of the security manager *checkSetFactory* method requires the RuntimePermission "setFactory") + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @see #getSystem * @see SecurityManager#checkSetFactory * @since 1.2 @@ -428,6 +436,8 @@ public abstract class ActivationGroup * @exception ActivationException if activation system cannot be * obtained or is not bound * (means that it is not running) + * @exception UnsupportedOperationException if and only if activation is + * not supported by this implementation * @see #setSystem * @since 1.2 */ diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationGroupID.java b/jdk/src/share/classes/java/rmi/activation/ActivationGroupID.java index 85c1f0f5906..bbd816fd73e 100644 --- a/jdk/src/share/classes/java/rmi/activation/ActivationGroupID.java +++ b/jdk/src/share/classes/java/rmi/activation/ActivationGroupID.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -63,6 +63,8 @@ public class ActivationGroupID implements java.io.Serializable { * Constructs a unique group id. * * @param system the group's activation system + * @throws UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public ActivationGroupID(ActivationSystem system) { diff --git a/jdk/src/share/classes/java/rmi/activation/ActivationID.java b/jdk/src/share/classes/java/rmi/activation/ActivationID.java index 1a5b33ff43c..02511b848b8 100644 --- a/jdk/src/share/classes/java/rmi/activation/ActivationID.java +++ b/jdk/src/share/classes/java/rmi/activation/ActivationID.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -90,6 +90,8 @@ public class ActivationID implements Serializable { * * @param activator reference to the activator responsible for * activating the object + * @throws UnsupportedOperationException if and only if activation is + * not supported by this implementation * @since 1.2 */ public ActivationID(Activator activator) { diff --git a/jdk/src/share/classes/java/rmi/activation/package.html b/jdk/src/share/classes/java/rmi/activation/package.html index ceb26788d1f..ed4bb79bffe 100644 --- a/jdk/src/share/classes/java/rmi/activation/package.html +++ b/jdk/src/share/classes/java/rmi/activation/package.html @@ -1,5 +1,5 @@