Bug 1597.

1 files changed, 10 insertions, 1 deletions

diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index 17056538cb7..2dcee6d1f1d 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -569,7 +569,16 @@ public final class ReferenceFactory
         property = propertyPrefix + ".Router";
         if(properties.getProperty(property).length() != 0)
         {
-            ref = ref.changeRouter(Ice.RouterPrxHelper.uncheckedCast(_communicator.propertyToProxy(property)));
+            if(propertyPrefix.endsWith(".Router))
+            {
+                String s = "`" + property + "=" + properties.getProperty(property) +
+                           "': cannot set a router on a router; setting ignored";
+                _instance.initializationData().logger.warning(s);
+            }
+            else
+            {
+                ref = ref.changeRouter(Ice.RouterPrxHelper.uncheckedCast(_communicator.propertyToProxy(property)));
+            }
         }
 
         property = propertyPrefix + ".PreferSecure";