diff options
Diffstat (limited to 'java/rmi/activation/ActivationGroup.java')
| -rw-r--r-- | java/rmi/activation/ActivationGroup.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/java/rmi/activation/ActivationGroup.java b/java/rmi/activation/ActivationGroup.java index f90300acc..2fc438a8d 100644 --- a/java/rmi/activation/ActivationGroup.java +++ b/java/rmi/activation/ActivationGroup.java @@ -281,8 +281,18 @@ public abstract class ActivationGroup } /** - * Get the current activation system. If the system is not set via this - * method, the default implementatin for this virtual machine is returned. + * Get the current activation system. If the system is not set via + * {@link #setSystem} method, the default system for this virtual machine is + * returned. The default system is first searched by name + * "java.rmi.activation.ActivationSystem" on the activation registry port. The + * default value of the activation registry port is + * {@link ActivationSystem#SYSTEM_PORT}, but it can be changed by putting the + * system property java.rmi.activation.port. Both activation system and + * activation registry are provided by the RMI daemon tool, RMID, if it is + * running on the local host. If the RMID is not running, the internal + * transient activation system will be created and returned. This internal + * system is highly limited in in capabilities and is not intended to be used + * anywhere apart automated testing. * * @return the activation system for this virtual machine * @throws ActivationException @@ -290,7 +300,7 @@ public abstract class ActivationGroup public static ActivationSystem getSystem() throws ActivationException { if (system == null) - return DefaultActivationSystem.singleton; + return DefaultActivationSystem.get(); else return system; } |