--- old/src/share/classes/java/rmi/activation/ActivationGroup.java	2013-07-16 00:14:14.087483392 -0400
+++ new/src/share/classes/java/rmi/activation/ActivationGroup.java	2013-07-16 00:14:13.584482430 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -37,6 +37,7 @@
 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
@@ -436,11 +437,14 @@
     {
         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("//:" + port +
+                    Naming.lookup("//" + host + ":" + port +
                                   "/java.rmi.activation.ActivationSystem");
             } catch (Exception e) {
                 throw new ActivationException(