diff options
Diffstat (limited to 'libjava/classpath/java/rmi/activation')
7 files changed, 17 insertions, 16 deletions
diff --git a/libjava/classpath/java/rmi/activation/Activatable.java b/libjava/classpath/java/rmi/activation/Activatable.java index 472c65c1110..0f201cacf63 100644 --- a/libjava/classpath/java/rmi/activation/Activatable.java +++ b/libjava/classpath/java/rmi/activation/Activatable.java @@ -103,7 +103,7 @@ public abstract class Activatable * @throws ActivationException if the activation failed * @throws RemoteException if the remote call failed. */ - protected Activatable(String codebase, MarshalledObject data, + protected Activatable(String codebase, MarshalledObject<?> data, boolean restart, int port) throws ActivationException, RemoteException { @@ -133,7 +133,7 @@ public abstract class Activatable * @throws ActivationException if the activation failed * @throws RemoteException if the remote call failed. */ - protected Activatable(String codebase, MarshalledObject data, + protected Activatable(String codebase, MarshalledObject<?> data, boolean restart, int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf) throws ActivationException, RemoteException @@ -314,7 +314,7 @@ public abstract class Activatable * @throws RemoteException if the registration or export fails */ public static ActivationID exportObject(Remote obj, String location, - MarshalledObject data, + MarshalledObject<?> data, boolean restart, int port) throws ActivationException, RemoteException { diff --git a/libjava/classpath/java/rmi/activation/ActivationDesc.java b/libjava/classpath/java/rmi/activation/ActivationDesc.java index b8616562fa5..ae2b78eca8e 100644 --- a/libjava/classpath/java/rmi/activation/ActivationDesc.java +++ b/libjava/classpath/java/rmi/activation/ActivationDesc.java @@ -80,7 +80,7 @@ public final class ActivationDesc /** * The object specific intitalization data. */ - private MarshalledObject data; + private MarshalledObject<?> data; /** * The start mode. @@ -95,7 +95,7 @@ public final class ActivationDesc * @param location the code base URL * @param data the object initialization data, contained in a marshalled form */ - public ActivationDesc(String className, String location, MarshalledObject data) + public ActivationDesc(String className, String location, MarshalledObject<?> data) throws ActivationException { this(ActivationGroup.currentGroupID(), className, location, data, false); @@ -115,7 +115,7 @@ public final class ActivationDesc * object is normally activated on demand). */ public ActivationDesc(String className, String location, - MarshalledObject data, boolean restart) + MarshalledObject<?> data, boolean restart) throws ActivationException { this(ActivationGroup.currentGroupID(), className, location, data, restart); @@ -131,7 +131,7 @@ public final class ActivationDesc * @param data the object initialization data, contained in a marshalled form */ public ActivationDesc(ActivationGroupID groupID, String className, - String location, MarshalledObject data) + String location, MarshalledObject<?> data) { this(groupID, className, location, data, false); } @@ -150,7 +150,7 @@ public final class ActivationDesc * object is normally activated on demand). */ public ActivationDesc(ActivationGroupID groupID, String className, - String location, MarshalledObject data, boolean restart) + String location, MarshalledObject<?> data, boolean restart) { this.groupid = groupID; this.classname = className; @@ -184,7 +184,7 @@ public final class ActivationDesc return location; } - public MarshalledObject getData() + public MarshalledObject<?> getData() { return data; } diff --git a/libjava/classpath/java/rmi/activation/ActivationGroup.java b/libjava/classpath/java/rmi/activation/ActivationGroup.java index 5e7bbd20998..ad5a05d01a9 100644 --- a/libjava/classpath/java/rmi/activation/ActivationGroup.java +++ b/libjava/classpath/java/rmi/activation/ActivationGroup.java @@ -314,7 +314,8 @@ public abstract class ActivationGroup * @throws UnknownObjectException if such object is not registered * @throws RemoteException on remote call (to monitor) error */ - protected void activeObject(ActivationID id, MarshalledObject mObject) + protected void activeObject(ActivationID id, + MarshalledObject<? extends Remote> mObject) throws ActivationException, UnknownObjectException, RemoteException { if (monitor!=null) diff --git a/libjava/classpath/java/rmi/activation/ActivationGroupDesc.java b/libjava/classpath/java/rmi/activation/ActivationGroupDesc.java index 76ac63b6391..bf7445f17bb 100644 --- a/libjava/classpath/java/rmi/activation/ActivationGroupDesc.java +++ b/libjava/classpath/java/rmi/activation/ActivationGroupDesc.java @@ -199,7 +199,7 @@ public final class ActivationGroupDesc /** * The group initialization data. */ - final MarshalledObject data; + final MarshalledObject<?> data; /** * The path to the group jre and the parameters of this jre, may be @@ -252,7 +252,7 @@ public final class ActivationGroupDesc * options. */ public ActivationGroupDesc(String aClassName, String aLocation, - MarshalledObject aData, Properties aProperties, + MarshalledObject<?> aData, Properties aProperties, ActivationGroupDesc.CommandEnvironment environment) { className = aClassName; @@ -288,7 +288,7 @@ public final class ActivationGroupDesc * * @return the group intialization data in the marshalled form. */ - public MarshalledObject getData() + public MarshalledObject<?> getData() { return data; } diff --git a/libjava/classpath/java/rmi/activation/ActivationInstantiator.java b/libjava/classpath/java/rmi/activation/ActivationInstantiator.java index a0f04ed36cd..3f4b557cb91 100644 --- a/libjava/classpath/java/rmi/activation/ActivationInstantiator.java +++ b/libjava/classpath/java/rmi/activation/ActivationInstantiator.java @@ -68,6 +68,6 @@ public interface ActivationInstantiator * @throws ActivationException if the activation fails * @throws RemoteException if the remote call fails */ - MarshalledObject newInstance (ActivationID id, ActivationDesc desc) + MarshalledObject<? extends Remote> newInstance (ActivationID id, ActivationDesc desc) throws ActivationException, RemoteException; } diff --git a/libjava/classpath/java/rmi/activation/ActivationMonitor.java b/libjava/classpath/java/rmi/activation/ActivationMonitor.java index e9f43ae1a94..93def8c441a 100644 --- a/libjava/classpath/java/rmi/activation/ActivationMonitor.java +++ b/libjava/classpath/java/rmi/activation/ActivationMonitor.java @@ -59,7 +59,7 @@ public interface ActivationMonitor extends Remote * @throws UnknownObjectException is such object is not known in this group * @throws RemoteException if remote call fails */ - void activeObject (ActivationID id, MarshalledObject obj) + void activeObject (ActivationID id, MarshalledObject<? extends Remote> obj) throws UnknownObjectException, RemoteException; /** diff --git a/libjava/classpath/java/rmi/activation/Activator.java b/libjava/classpath/java/rmi/activation/Activator.java index 57a4d16a723..d0de12d8c97 100644 --- a/libjava/classpath/java/rmi/activation/Activator.java +++ b/libjava/classpath/java/rmi/activation/Activator.java @@ -67,6 +67,6 @@ public interface Activator * @throws ActivationException if the activation has failed due other reason * @throws RemoteException if the remote call has failed. */ - MarshalledObject activate (ActivationID id, boolean force) + MarshalledObject<? extends Remote> activate (ActivationID id, boolean force) throws ActivationException, UnknownObjectException, RemoteException; } |
