diff options
Diffstat (limited to 'libjava/classpath/java/rmi/server')
20 files changed, 154 insertions, 154 deletions
diff --git a/libjava/classpath/java/rmi/server/LoaderHandler.java b/libjava/classpath/java/rmi/server/LoaderHandler.java index 8e966156475..de9d6532fa9 100644 --- a/libjava/classpath/java/rmi/server/LoaderHandler.java +++ b/libjava/classpath/java/rmi/server/LoaderHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 diff --git a/libjava/classpath/java/rmi/server/LogStream.java b/libjava/classpath/java/rmi/server/LogStream.java index a2dfbb47fcc..a74ffb4398b 100644 --- a/libjava/classpath/java/rmi/server/LogStream.java +++ b/libjava/classpath/java/rmi/server/LogStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -72,7 +72,7 @@ public class LogStream extends PrintStream { return defStream; } - + /** * @deprecated */ @@ -130,17 +130,17 @@ public class LogStream extends PrintStream { return SILENT; } - + if (s.equalsIgnoreCase ("brief")) { return BRIEF; } - + if (s.equalsIgnoreCase ("verbose")) { return VERBOSE; } - + return SILENT; } } diff --git a/libjava/classpath/java/rmi/server/ObjID.java b/libjava/classpath/java/rmi/server/ObjID.java index 1aaa223602c..2bdd44ae02e 100644 --- a/libjava/classpath/java/rmi/server/ObjID.java +++ b/libjava/classpath/java/rmi/server/ObjID.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -50,7 +50,7 @@ import java.io.Serializable; * Represents the object identifier, unique for the host that generated it. * The ObjID contains inside the integer object identifier that, if needed, * may indicated that this is a reference to one of the well known objects - * on that host (registry, activator or dgc) and the {@link UID} that + * on that host (registry, activator or dgc) and the {@link UID} that * ensures uniqueness. */ public final class ObjID @@ -121,7 +121,7 @@ public final class ObjID * <li>{@link #DGC_ID} - distributed garbage collector (grants lease * durations to keep the object before it is garbage collected.</li> * </ul> - * + * * @param id the well known object id, one of the above. */ public ObjID(int id) @@ -184,8 +184,8 @@ public final class ObjID return a == b; else return a.equals(b); - } - + } + /** * Get the string representation. */ diff --git a/libjava/classpath/java/rmi/server/Operation.java b/libjava/classpath/java/rmi/server/Operation.java index f7b5f02cc0b..de30cd08ac1 100644 --- a/libjava/classpath/java/rmi/server/Operation.java +++ b/libjava/classpath/java/rmi/server/Operation.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -40,7 +40,7 @@ package java.rmi.server; /** * This class was used with jdk 1.1 stubs and skeletons. It is no longer * needed since jdk 1.2 and higher. - * + * * @deprecated */ public class Operation @@ -58,7 +58,7 @@ public class Operation /** * Get the name of the operation. - * + * * @deprecated */ public String getOperation () @@ -68,7 +68,7 @@ public class Operation /** * Return the name of the operation. - * + * * @deprecated */ public String toString () diff --git a/libjava/classpath/java/rmi/server/RMIClassLoader.java b/libjava/classpath/java/rmi/server/RMIClassLoader.java index 7b69d2f2c72..f43a68c5b29 100644 --- a/libjava/classpath/java/rmi/server/RMIClassLoader.java +++ b/libjava/classpath/java/rmi/server/RMIClassLoader.java @@ -74,7 +74,7 @@ public class RMIClassLoader { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.loadClass(codebase, name, null); } @@ -84,7 +84,7 @@ public class RMIClassLoader { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.loadClass(codebase, name, defaultLoader); } @@ -120,29 +120,29 @@ public class RMIClassLoader { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.loadClass(codeBase.toString(), name, null); } /** * Gets a classloader for the given codebase and with the current * context classloader as parent. - * + * * @param codebase - * + * * @return a classloader for the given codebase - * + * * @throws MalformedURLException if the codebase contains a malformed URL */ - public static ClassLoader getClassLoader(String codebase) + public static ClassLoader getClassLoader(String codebase) throws MalformedURLException { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.getClassLoader(codebase); } - + /** * Returns a string representation of the network location where a remote * endpoint can get the class-definition of the given class. @@ -156,7 +156,7 @@ public class RMIClassLoader { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.getClassAnnotation(cl); } diff --git a/libjava/classpath/java/rmi/server/RMIClientSocketFactory.java b/libjava/classpath/java/rmi/server/RMIClientSocketFactory.java index a54d11175e0..ee829fb29de 100644 --- a/libjava/classpath/java/rmi/server/RMIClientSocketFactory.java +++ b/libjava/classpath/java/rmi/server/RMIClientSocketFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 diff --git a/libjava/classpath/java/rmi/server/RMIFailureHandler.java b/libjava/classpath/java/rmi/server/RMIFailureHandler.java index 3496cd6a073..68a5706ed0a 100644 --- a/libjava/classpath/java/rmi/server/RMIFailureHandler.java +++ b/libjava/classpath/java/rmi/server/RMIFailureHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 diff --git a/libjava/classpath/java/rmi/server/RMIServerSocketFactory.java b/libjava/classpath/java/rmi/server/RMIServerSocketFactory.java index 88eaff32dbc..7af8ef06908 100644 --- a/libjava/classpath/java/rmi/server/RMIServerSocketFactory.java +++ b/libjava/classpath/java/rmi/server/RMIServerSocketFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 diff --git a/libjava/classpath/java/rmi/server/RMISocketFactory.java b/libjava/classpath/java/rmi/server/RMISocketFactory.java index 953f1ef33ce..af5a12072ad 100644 --- a/libjava/classpath/java/rmi/server/RMISocketFactory.java +++ b/libjava/classpath/java/rmi/server/RMISocketFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 diff --git a/libjava/classpath/java/rmi/server/RemoteCall.java b/libjava/classpath/java/rmi/server/RemoteCall.java index 35f3bf1a655..cd4b004d8ca 100644 --- a/libjava/classpath/java/rmi/server/RemoteCall.java +++ b/libjava/classpath/java/rmi/server/RemoteCall.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 diff --git a/libjava/classpath/java/rmi/server/RemoteObject.java b/libjava/classpath/java/rmi/server/RemoteObject.java index 5b926bfc34e..220c1c95b5b 100644 --- a/libjava/classpath/java/rmi/server/RemoteObject.java +++ b/libjava/classpath/java/rmi/server/RemoteObject.java @@ -48,7 +48,7 @@ import java.rmi.UnmarshalException; import java.util.WeakHashMap; public abstract class RemoteObject - implements Remote, Serializable { + implements Remote, Serializable { private static final long serialVersionUID = -3215090123894869218l; @@ -57,15 +57,15 @@ protected transient RemoteRef ref; private static final WeakHashMap stubs = new WeakHashMap(); protected RemoteObject() { - this(null); + this(null); } protected RemoteObject(RemoteRef newref) { - ref = newref; + ref = newref; } public RemoteRef getRef() { - return (ref); + return (ref); } synchronized static void addStub(Remote obj, Remote stub) @@ -78,7 +78,7 @@ synchronized static void deleteStub(Remote obj) stubs.remove(obj); } - public static Remote toStub(Remote obj) throws NoSuchObjectException + public static Remote toStub(Remote obj) throws NoSuchObjectException { Remote stub = (Remote)stubs.get(obj); @@ -89,36 +89,36 @@ synchronized static void deleteStub(Remote obj) } public int hashCode() { - if (ref == null) { - return (0); - } - else { - return (ref.hashCode()); - } + if (ref == null) { + return (0); + } + else { + return (ref.hashCode()); + } } public boolean equals(Object obj) { - // We only compare references. - return (this == obj); + // We only compare references. + return (this == obj); } /** * Get the string representation of this remote object. */ - public String toString() + public String toString() { if (ref == null) return getClass ().toString (); return (ref.toString ()); } - + /** * Read the remote object from the input stream. Expects the class name * without package first. Then the method creates and assigns the {@link #ref} * an instance of this class and calls its .readExternal method. The standard * packageless class names are UnicastRef, UnicastRef2, UnicastServerRef, * UnicastServerRef2, ActivatableRef or ActivatableServerRef. - * + * * @param in the stream to read from * @throws IOException if the IO exception occurs * @throws ClassNotFoundException if the class with the given name is not @@ -171,7 +171,7 @@ public boolean equals(Object obj) { * ActivatableRef or ActivatableServerRef. The empty string with the * subsequently following serialized ref instance be written if the * ref.getRefClass returns null. - * + * * @param out the stream to write to * @throws IOException if one occurs during writing * @throws ClassNotFoundException never in this implementation (specified as diff --git a/libjava/classpath/java/rmi/server/RemoteObjectInvocationHandler.java b/libjava/classpath/java/rmi/server/RemoteObjectInvocationHandler.java index 2c19cd5afc4..0cf4bca989a 100644 --- a/libjava/classpath/java/rmi/server/RemoteObjectInvocationHandler.java +++ b/libjava/classpath/java/rmi/server/RemoteObjectInvocationHandler.java @@ -60,7 +60,7 @@ import java.util.Hashtable; * user program. Such instances are automatically created and returned by * {@link Registry} or {@link UnicastRemoteObject} methods if the remote * reference is known but the corresponding stub class is not accessible. - * + * * @see Registry#lookup * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) @@ -72,32 +72,32 @@ public class RemoteObjectInvocationHandler extends RemoteObject implements * Use the jdk 1.5 SUID for interoperability. */ static final long serialVersionUID = 2L; - + /** * The RMI method hash codes, computed once as described in the section 8.3 * of the Java Remote Method Invocation (RMI) Specification. */ static Hashtable methodHashCodes = new Hashtable(); - + /** * The empty class array to define parameters of .hashCode and .toString. */ static final Class[] noArgsC = new Class[0]; - + /** * The class array to define parameters of .equals */ static final Class[] anObjectC = new Class[] { Object.class }; - + /** * The empty object array to replace null when no args are passed. */ static final Object[] noArgs = new Object[0]; - + /** * Construct the remote invocation handler that forwards calls to the given * remote object. - * + * * @param reference the reference to the remote object where the method * calls should be forwarded. */ @@ -121,7 +121,7 @@ public class RemoteObjectInvocationHandler extends RemoteObject implements * <li>All other methods are converted to remote calls and forwarded to the * remote reference. </li> * </ul> - * + * * @param proxyInstance * the instance of the proxy stub * @param method @@ -148,7 +148,7 @@ public class RemoteObjectInvocationHandler extends RemoteObject implements throw new IllegalAccessException(name + " does not implement " + Remote.class.getName()); } - + if (parameters == null) parameters = noArgs; diff --git a/libjava/classpath/java/rmi/server/RemoteRef.java b/libjava/classpath/java/rmi/server/RemoteRef.java index 8bdb6633040..e0488fb4c67 100644 --- a/libjava/classpath/java/rmi/server/RemoteRef.java +++ b/libjava/classpath/java/rmi/server/RemoteRef.java @@ -1,5 +1,5 @@ /* RemoteRef.java -- - Copyright (c) 1996, 1997, 1998, 1999, 2004, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2004, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -56,7 +56,7 @@ public interface RemoteRef extends Externalizable * Indicates compatibility with JDK 1.1.* */ long serialVersionUID = 3632638527362204081L; - + /** * For binary compatibility with the JDK, the string "sun.rmi.server". * Not actually used for anything. @@ -67,12 +67,12 @@ public interface RemoteRef extends Externalizable * @deprecated use {@link #invoke(Remote, Method, Object[], long)} instead. */ void invoke (RemoteCall call) throws Exception; - + /** * Invoke a method. This method either returns the result of remote invocation * or throws RemoteException if the remote call failed. Other exceptions may * be thrown if some problem has occured in the application level. - * + * * @param obj the object, containing the remote reference (for instance, * remote stub, generated by rmic). * @param method the method to invoke @@ -85,7 +85,7 @@ public interface RemoteRef extends Externalizable */ Object invoke (Remote obj, Method method, Object[] params, long methodHash) throws Exception; - + /** * @deprecated use {@link #invoke(Remote, Method, Object[], long)} instead. */ @@ -96,41 +96,41 @@ public interface RemoteRef extends Externalizable * @deprecated use {@link #invoke(Remote, Method, Object[], long)} instead. */ void done (RemoteCall call) throws RemoteException; - + /** * Compare two remote objects for equality. The references are equal if * they point to the same remote object. - * + * * @param ref the reference to compare. - * + * * @return true if this and passed references both point to the same remote * object, false otherwise. */ boolean remoteEquals (RemoteRef ref); - + /** * Get the hashcode for a remote object. Two remote object stubs, referring * to the same remote object, have the same hash code. - * + * * @return the hashcode of the remote object */ int remoteHashCode(); - - + + /** * Returns the class name of the reference type that must be written to the * given stream. When writing, this returned name is passed first, and * the reference.writeExternal(out) writes the reference specific data. - * - * @param out the stream, where the data must be written - * - * @return the class name. + * + * @param out the stream, where the data must be written + * + * @return the class name. */ String getRefClass (ObjectOutput out); - + /** * Get the string representation of this remote reference. - * + * * @return the string representation. */ String remoteToString(); diff --git a/libjava/classpath/java/rmi/server/RemoteServer.java b/libjava/classpath/java/rmi/server/RemoteServer.java index f022b732604..158c4643919 100644 --- a/libjava/classpath/java/rmi/server/RemoteServer.java +++ b/libjava/classpath/java/rmi/server/RemoteServer.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -51,7 +51,7 @@ public abstract class RemoteServer extends RemoteObject { private static final long serialVersionUID = - 4100238210092549637L; - + /** * Does nothing, delegates to super(). */ @@ -59,7 +59,7 @@ public abstract class RemoteServer { super(); } - + /** * Does nothing, delegates to super(ref). */ @@ -67,13 +67,13 @@ public abstract class RemoteServer { super(ref); } - + /** * Get the host of the calling client. The current thread must be an instance * of the {@link RMIIncomingThread}. - * + * * @return the client host address - * + * * @throws ServerNotActiveException if the current thread is not an instance * of the RMIIncomingThread. */ @@ -91,20 +91,20 @@ public abstract class RemoteServer "Unknown client host - current thread not instance of 'RMIIncomingThread'"); } } - + /** * Set the stream for logging RMI calls. - * + * * @param out the stream to set or null to turn the logging off. */ public static void setLog(OutputStream out) { throw new Error("Not implemented"); } - + /** * Get the stream for logging RMI calls. - * + * * @return the associated stream. */ public static PrintStream getLog() diff --git a/libjava/classpath/java/rmi/server/RemoteStub.java b/libjava/classpath/java/rmi/server/RemoteStub.java index d6dff7fadc8..9fd5846ee29 100644 --- a/libjava/classpath/java/rmi/server/RemoteStub.java +++ b/libjava/classpath/java/rmi/server/RemoteStub.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -38,7 +38,7 @@ exception statement from your version. */ package java.rmi.server; /** - * This is a base class for the automatically generated RMI stubs. + * This is a base class for the automatically generated RMI stubs. */ public abstract class RemoteStub extends RemoteObject { @@ -46,7 +46,7 @@ public abstract class RemoteStub extends RemoteObject * Use serialVersionUID for interoperability. */ static final long serialVersionUID = -1585587260594494182l; - + /** * Constructs the remote stub with no reference set. */ @@ -54,11 +54,11 @@ public abstract class RemoteStub extends RemoteObject { super (); } - + /** * Constructs the remote stub that uses given remote reference for the * method invocations. - * + * * @param ref the remote reference for the method invocation. */ protected RemoteStub (RemoteRef ref) @@ -67,10 +67,10 @@ public abstract class RemoteStub extends RemoteObject } /** - * Sets the given remote reference for the given stub. This method is + * Sets the given remote reference for the given stub. This method is * deprecated. Pass the stub remote reference to the RemoteStub * constructor instead. - * + * * @deprecated */ protected static void setRef (RemoteStub stub, RemoteRef ref) diff --git a/libjava/classpath/java/rmi/server/ServerRef.java b/libjava/classpath/java/rmi/server/ServerRef.java index cf1013cf02b..5d34ef2e21f 100644 --- a/libjava/classpath/java/rmi/server/ServerRef.java +++ b/libjava/classpath/java/rmi/server/ServerRef.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 diff --git a/libjava/classpath/java/rmi/server/Skeleton.java b/libjava/classpath/java/rmi/server/Skeleton.java index 82f5d3837f4..94d57986b29 100644 --- a/libjava/classpath/java/rmi/server/Skeleton.java +++ b/libjava/classpath/java/rmi/server/Skeleton.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 diff --git a/libjava/classpath/java/rmi/server/UID.java b/libjava/classpath/java/rmi/server/UID.java index 940339e813a..464d3d8606b 100644 --- a/libjava/classpath/java/rmi/server/UID.java +++ b/libjava/classpath/java/rmi/server/UID.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -49,8 +49,8 @@ import java.net.InetAddress; * it. It contains time (when created), counter (the number of the UID * creation order) and virtual machine id components. The UID can also be * constructed specifying a "well known" identifier in the for of short: - * this identifier defines the UID uniqueness alone. - * + * this identifier defines the UID uniqueness alone. + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) */ public final class UID @@ -60,16 +60,16 @@ public final class UID * Use the serial version uid for interoperability. */ private static final long serialVersionUID = 1086053664494604050L; - + /** * The UID counter (the ordinary number in the sequence of number of UID's, - * created during the recent millisecond). In the next millisecond, it + * created during the recent millisecond). In the next millisecond, it * starts from the minimal value again. In the unlikely case of creating * more than 65536 uids per millisecond the process pauses till the next * ms. */ private static short uidCounter = Short.MIN_VALUE; - + /** * The time, when the last UID has been created. */ @@ -94,7 +94,7 @@ public final class UID * The time stamp, when the UID was created. */ private long time; - + /** * Create the new UID that would have the described features of the * uniqueness. @@ -130,19 +130,19 @@ public final class UID } } } - + /** * Create the new UID with the well known id (number). All UIDs, creates * with the this constructor having the same parameter are equal to each * other (regardless to the host and time where they were created. - * + * * @param wellKnownId the well known UID. */ public UID(short wellKnownId) { unique = wellKnownId; } - + /** * Get the hashCode of this UID. */ @@ -150,7 +150,7 @@ public final class UID { return (int) (unique ^ time ^ count); } - + /** * Compare this UID with another UID for equality (not equal to other types of * objects). @@ -165,7 +165,7 @@ public final class UID else return false; } - + public static UID read(DataInput in) throws IOException { UID uid = new UID(); @@ -208,10 +208,10 @@ public final class UID return new Object().hashCode() ^ (int) System.currentTimeMillis() ^ hostIpHash; } - + /** * Get the string representation of this UID. - * + * * @return a string, uniquely identifying this id. */ public String toString() diff --git a/libjava/classpath/java/rmi/server/UnicastRemoteObject.java b/libjava/classpath/java/rmi/server/UnicastRemoteObject.java index 6ef3432b567..b6a97212605 100644 --- a/libjava/classpath/java/rmi/server/UnicastRemoteObject.java +++ b/libjava/classpath/java/rmi/server/UnicastRemoteObject.java @@ -1,5 +1,5 @@ /* UnicastRemoteObject.java -- - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 @@ -46,7 +46,7 @@ import java.rmi.Remote; import java.rmi.RemoteException; /** - * This class obtains stub that communicates with the remote object. + * This class obtains stub that communicates with the remote object. */ public class UnicastRemoteObject extends RemoteServer { @@ -57,19 +57,19 @@ public class UnicastRemoteObject extends RemoteServer //The following serialized fields are from Java API Documentation // "Serialized form" - + /** * The port, on that the created remote object becomes available, * zero meaning the anonymous port. */ private int port; - + /** * The client socket factory for producing client sockets, used by this * object. */ private RMIClientSocketFactory csf; - + /** * The server socket factory for producing server sockets, used by this * object. @@ -78,44 +78,44 @@ public class UnicastRemoteObject extends RemoteServer /** * Create and export new remote object without specifying the port value. - * + * * @throws RemoteException if the attempt to export the object failed. */ protected UnicastRemoteObject() throws RemoteException { - this(0); + this(0); } - + /** * Create and export the new remote object, making it available at the * given port, local host. - * + * * @param port the port, on that the object should become available. * Zero means anonymous port. - * + * * @throws RemoteException if the attempt to export the object failed. */ protected UnicastRemoteObject(int port) throws RemoteException { - this(port, RMISocketFactory.getSocketFactory(), + this(port, RMISocketFactory.getSocketFactory(), RMISocketFactory.getSocketFactory()); } /** * Create and export the new remote object, making it available at the * given port, using sockets, produced by the specified factories. - * + * * @param port the port, on that the object should become available. * Zero means anonymous port. - * + * * @param clientSocketFactory the client socket factory * @param serverSocketFactory the server socket factory - * + * * @throws RemoteException if the attempt to export the object failed. */ - protected UnicastRemoteObject(int port, + protected UnicastRemoteObject(int port, RMIClientSocketFactory clientSocketFactory, RMIServerSocketFactory serverSocketFactory) throws RemoteException @@ -131,53 +131,53 @@ public class UnicastRemoteObject extends RemoteServer protected UnicastRemoteObject(RemoteRef ref) throws RemoteException { - super((UnicastServerRef) ref); - exportObject(this, 0); + super((UnicastServerRef) ref); + exportObject(this, 0); } public Object clone() throws CloneNotSupportedException { - throw new Error("Not implemented"); + throw new Error("Not implemented"); } - + /** - * Export object, making it available for the remote calls at the - * anonymous port. - * + * Export object, making it available for the remote calls at the + * anonymous port. + * * This method returns the instance of the abstract class, not an interface. * Hence it will not work with the proxy stubs that are supported since * jdk 1.5 (such stubs cannot be derived from the RemoteStub). Only use * this method if you are sure that the stub class will be accessible. - * + * * @param obj the object being exported. - * + * * @return the remote object stub - * + * * @throws RemoteException if the attempt to export the object failed. */ public static RemoteStub exportObject(Remote obj) throws RemoteException { - return (RemoteStub) exportObject(obj, 0); + return (RemoteStub) exportObject(obj, 0); } /** - * Export object, making it available for the remote calls at the + * Export object, making it available for the remote calls at the * specified port. - * + * * Since jdk 1.5 this method does not longer require the stub class to be - * present. If such class is not found, the stub is replaced by the + * present. If such class is not found, the stub is replaced by the * dynamically constructed proxy class. No attempt to find and load the stubs * is made if the system property java.rmi.server.ignoreStubClasses - * is set to true (set to reduce the starting time if the stubs are + * is set to true (set to reduce the starting time if the stubs are * surely not present and exclusively 1.2 RMI is used). - * + * * @param obj the object being exported. * @param port the remote object port - * + * * @return the remote object stub - * + * * @throws RemoteException if the attempt to export the object failed. */ public static Remote exportObject(Remote obj, int port) @@ -189,21 +189,21 @@ public class UnicastRemoteObject extends RemoteServer /** * Create and export the new remote object, making it available at the * given port, using sockets, produced by the specified factories. - * + * * Since jdk 1.5 this method does not longer require the stub class to be - * present. If such class is not found, the stub is replaced by the + * present. If such class is not found, the stub is replaced by the * dynamically constructed proxy class. No attempt to find and load the stubs * is made if the system property java.rmi.server.ignoreStubClasses - * is set to true (set to reduce the starting time if the stubs are + * is set to true (set to reduce the starting time if the stubs are * surely not present and exclusively 1.2 RMI is used). - * + * * @param port the port, on that the object should become available. * Zero means anonymous port. - * + * * @param serverSocketFactory the server socket factory - */ - static Remote exportObject(Remote obj, int port, - RMIServerSocketFactory serverSocketFactory) + */ + static Remote exportObject(Remote obj, int port, + RMIServerSocketFactory serverSocketFactory) throws RemoteException { UnicastServerRef sref = null; @@ -224,13 +224,13 @@ public class UnicastRemoteObject extends RemoteServer public static Remote exportObject(Remote obj, int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf) - throws RemoteException + throws RemoteException { return (exportObject(obj, port, ssf)); } - public static boolean unexportObject(Remote obj, boolean force) - throws NoSuchObjectException + public static boolean unexportObject(Remote obj, boolean force) + throws NoSuchObjectException { if (obj instanceof RemoteObject) { diff --git a/libjava/classpath/java/rmi/server/Unreferenced.java b/libjava/classpath/java/rmi/server/Unreferenced.java index 982aa64458f..6d4df48bc41 100644 --- a/libjava/classpath/java/rmi/server/Unreferenced.java +++ b/libjava/classpath/java/rmi/server/Unreferenced.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath 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 |
