1 files changed, 5 insertions, 6 deletions
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;
   }
 
   /**