diff options
| author | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2006-03-26 10:13:59 +0000 |
|---|---|---|
| committer | Audrius Meskauskas <audriusa@Bioinformatics.org> | 2006-03-26 10:13:59 +0000 |
| commit | 102f82f68e7393d076a82e4ba62ca3835b6af5eb (patch) | |
| tree | a934dfebcf4aa8fdb88a7d30a98371a4ef9d21de | |
| parent | b6ca430c9a4f8d3bda72fd19deceec3c29a6d55c (diff) | |
| download | classpath-102f82f68e7393d076a82e4ba62ca3835b6af5eb.tar.gz | |
2006-03-26 Audrius Meskauskas <AudriusA@Bioinformatics.org>generics-merge-20060326
* gnu/java/rmi/activation/DefaultActivationGroup.java:
Documented the default jre spawning strategy (none).
* java/rmi/activation/ActivationGroup.java (currentGroupId,
getSystem): Obtain the acticivation system from the
DefaultActivationSystem.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gnu/java/rmi/activation/DefaultActivationGroup.java | 3 | ||||
| -rw-r--r-- | java/rmi/activation/ActivationGroup.java | 11 |
3 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2006-03-26 Audrius Meskauskas <AudriusA@Bioinformatics.org> + + * gnu/java/rmi/activation/DefaultActivationGroup.java: + Documented the default jre spawning strategy (none). + * java/rmi/activation/ActivationGroup.java (currentGroupId, + getSystem): Obtain the acticivation system from the + DefaultActivationSystem. + 2006-03-26 Raif S. Naffah <raif@swiftdsl.com.au> * tools/gnu/classpath/tools/jarsigner/Main.java (setupSigningParams): diff --git a/gnu/java/rmi/activation/DefaultActivationGroup.java b/gnu/java/rmi/activation/DefaultActivationGroup.java index dc2a3221a..3a654f246 100644 --- a/gnu/java/rmi/activation/DefaultActivationGroup.java +++ b/gnu/java/rmi/activation/DefaultActivationGroup.java @@ -55,7 +55,8 @@ import java.rmi.activation.UnknownObjectException; /** * The default activation group class. This activation group assumes that * all classes are accessible via current thread context class loader. - * The remote class loading is not supported for security reasons. + * The remote class loading is not supported for security reasons. The + * activation always occurs in the current jre. * * @author Audrius Meskauskas (audriusa@Bioinformatics.org) */ diff --git a/java/rmi/activation/ActivationGroup.java b/java/rmi/activation/ActivationGroup.java index 2fc438a8d..5e7bbd209 100644 --- a/java/rmi/activation/ActivationGroup.java +++ b/java/rmi/activation/ActivationGroup.java @@ -38,7 +38,6 @@ exception statement from your version. */ package java.rmi.activation; -import gnu.java.rmi.activation.ActivationSystemTransient; import gnu.java.rmi.activation.DefaultActivationGroup; import gnu.java.rmi.activation.DefaultActivationSystem; @@ -230,7 +229,9 @@ public abstract class ActivationGroup { if (currentGroupId==null) { - setSystem(ActivationSystemTransient.getInstance()); + // This will also assing the currentGroupId to the current + // (default) group of the default system. + setSystem(DefaultActivationSystem.get()); } } catch (ActivationException e) @@ -240,7 +241,6 @@ public abstract class ActivationGroup throw ierr; } - return currentGroupId; } @@ -300,9 +300,8 @@ public abstract class ActivationGroup public static ActivationSystem getSystem() throws ActivationException { if (system == null) - return DefaultActivationSystem.get(); - else - return system; + system = DefaultActivationSystem.get(); + return system; } /** |