src/share/classes/java/rmi/activation/ActivationGroup.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 35,44 ****
--- 35,45 ----
  import java.rmi.activation.UnknownObjectException;
  import java.rmi.server.RMIClassLoader;
  import java.rmi.server.UnicastRemoteObject;
  import java.security.AccessController;
  import sun.security.action.GetIntegerAction;
+ import sun.security.action.GetPropertyAction;
  
  /**
   * An <code>ActivationGroup</code> is responsible for creating new
   * instances of "activatable" objects in its group, informing its
   * <code>ActivationMonitor</code> when either: its object's become
*** 434,448 ****
      public static synchronized ActivationSystem getSystem()
          throws ActivationException
      {
          if (currSystem == null) {
              try {
                  int port = AccessController.doPrivileged(
                      new GetIntegerAction("java.rmi.activation.port",
                                           ActivationSystem.SYSTEM_PORT));
                  currSystem = (ActivationSystem)
!                     Naming.lookup("//:" + port +
                                    "/java.rmi.activation.ActivationSystem");
              } catch (Exception e) {
                  throw new ActivationException(
                      "unable to obtain ActivationSystem", e);
              }
--- 435,452 ----
      public static synchronized ActivationSystem getSystem()
          throws ActivationException
      {
          if (currSystem == null) {
              try {
+                 String host = AccessController.doPrivileged(
+                     new GetPropertyAction("sun.rmi.activation.host",
+                                          ""));
                  int port = AccessController.doPrivileged(
                      new GetIntegerAction("java.rmi.activation.port",
                                           ActivationSystem.SYSTEM_PORT));
                  currSystem = (ActivationSystem)
!                     Naming.lookup("//" + host + ":" + port +
                                    "/java.rmi.activation.ActivationSystem");
              } catch (Exception e) {
                  throw new ActivationException(
                      "unable to obtain ActivationSystem", e);
              }