Merge remote-tracking branch 'origin/3.7' into swift

2 files changed, 12 insertions, 0 deletions

diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java
index 23968550b11..f95213fa2d3 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java
@@ -330,6 +330,13 @@ public interface ObjectPrx
     }
 
     /**
+     * Returns whether this proxy is a fixed proxy.
+     *
+     * @return <code>true</code> if this is a fixed proxy, <code>false</code> otherwise.
+     **/
+    boolean ice_isFixed();
+
+    /**
      * Returns a proxy that is identical to this proxy, except for the locator cache timeout.
      *
      * @param newTimeout The new locator cache timeout (in seconds).
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java
index 867193fced0..e2b70a29539 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/_ObjectPrxI.java
@@ -248,6 +248,11 @@ public class _ObjectPrxI implements ObjectPrx, java.io.Serializable
         return _reference.getEndpointSelection();
     }
 
+    public boolean ice_isFixed()
+    {
+        return _reference instanceof com.zeroc.IceInternal.FixedReference;
+    }
+
     public boolean ice_isSecure()
     {
         return _reference.getSecure();