src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java

Print this page
rev 597 : 8047722: @since tag cleanup in corba
Reviewed-by:

*** 87,97 **** /** * IIOPInputStream is used by the ValueHandlerImpl to handle Java serialization * input semantics. * * @author Stephen Lewallen ! * @since JDK1.1.6 */ public class IIOPInputStream extends com.sun.corba.se.impl.io.InputStreamHook { --- 87,97 ---- /** * IIOPInputStream is used by the ValueHandlerImpl to handle Java serialization * input semantics. * * @author Stephen Lewallen ! * @since 1.1.6 */ public class IIOPInputStream extends com.sun.corba.se.impl.io.InputStreamHook {
*** 336,346 **** } /** * Override the actions of the final method "readObject()" * in ObjectInputStream. ! * @since JDK1.1.6 * * Read an object from the ObjectInputStream. * The class of the object, the signature of the class, and the values * of the non-transient and non-static fields of the class and all * of its supertypes are read. Default deserializing for a class can be --- 336,346 ---- } /** * Override the actions of the final method "readObject()" * in ObjectInputStream. ! * @since 1.1.6 * * Read an object from the ObjectInputStream. * The class of the object, the signature of the class, and the values * of the non-transient and non-static fields of the class and all * of its supertypes are read. Default deserializing for a class can be
*** 366,376 **** * @exception StreamCorruptedException Control information in the * stream is inconsistent. * @exception OptionalDataException Primitive data was found in the * stream instead of objects. * @exception IOException Any of the usual Input/Output related exceptions. ! * @since JDK1.1 */ public final synchronized Object readObjectDelegate() throws IOException { try { --- 366,376 ---- * @exception StreamCorruptedException Control information in the * stream is inconsistent. * @exception OptionalDataException Primitive data was found in the * stream instead of objects. * @exception IOException Any of the usual Input/Output related exceptions. ! * @since 1.1 */ public final synchronized Object readObjectDelegate() throws IOException { try {
*** 532,553 **** * * @return the Object read from the stream. * * @see #ObjectInputStream() * @see #readObject ! * @since JDK 1.2 */ protected final Object readObjectOverride() throws OptionalDataException, ClassNotFoundException, IOException { return readObjectDelegate(); } /** * Override the actions of the final method "defaultReadObject()" * in ObjectInputStream. ! * @since JDK1.1.6 * * Read the non-static and non-transient fields of the current class * from this stream. This may only be called from the readObject method * of the class being deserialized. It will throw the NotActiveException * if it is called otherwise. --- 532,553 ---- * * @return the Object read from the stream. * * @see #ObjectInputStream() * @see #readObject ! * @since 1.2 */ protected final Object readObjectOverride() throws OptionalDataException, ClassNotFoundException, IOException { return readObjectDelegate(); } /** * Override the actions of the final method "defaultReadObject()" * in ObjectInputStream. ! * @since 1.1.6 * * Read the non-static and non-transient fields of the current class * from this stream. This may only be called from the readObject method * of the class being deserialized. It will throw the NotActiveException * if it is called otherwise.
*** 555,565 **** * @exception java.lang.ClassNotFoundException if the class of a serialized * object could not be found. * @exception IOException if an I/O error occurs. * @exception NotActiveException if the stream is not currently reading * objects. ! * @since JDK1.1 */ final synchronized void defaultReadObjectDelegate() /* throws IOException, ClassNotFoundException, NotActiveException */ { try { --- 555,565 ---- * @exception java.lang.ClassNotFoundException if the class of a serialized * object could not be found. * @exception IOException if an I/O error occurs. * @exception NotActiveException if the stream is not currently reading * objects. ! * @since 1.1 */ final synchronized void defaultReadObjectDelegate() /* throws IOException, ClassNotFoundException, NotActiveException */ { try {
*** 615,635 **** } /** * Override the actions of the final method "enableResolveObject()" * in ObjectInputStream. ! * @since JDK1.1.6 * * Enable the stream to allow objects read from the stream to be replaced. * If the stream is a trusted class it is allowed to enable replacment. * Trusted classes are those classes with a classLoader equals null. <p> * * When enabled the resolveObject method is called for every object * being deserialized. * * @exception SecurityException The classloader of this stream object is non-null. ! * @since JDK1.1 */ public final boolean enableResolveObjectDelegate(boolean enable) /* throws SecurityException */ { return false; --- 615,635 ---- } /** * Override the actions of the final method "enableResolveObject()" * in ObjectInputStream. ! * @since 1.1.6 * * Enable the stream to allow objects read from the stream to be replaced. * If the stream is a trusted class it is allowed to enable replacment. * Trusted classes are those classes with a classLoader equals null. <p> * * When enabled the resolveObject method is called for every object * being deserialized. * * @exception SecurityException The classloader of this stream object is non-null. ! * @since 1.1 */ public final boolean enableResolveObjectDelegate(boolean enable) /* throws SecurityException */ { return false;