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

4 files changed, 17 insertions, 1 deletions

diff --git a/js/src/Ice/ObjectPrx.d.ts b/js/src/Ice/ObjectPrx.d.ts
index a377f92c4fb..6ea90a7022b 100644
--- a/js/src/Ice/ObjectPrx.d.ts
+++ b/js/src/Ice/ObjectPrx.d.ts
@@ -352,6 +352,13 @@ declare module "ice"
             ice_fixed(conn:Connection):this;
 
             /**
+             * Returns whether this proxy is a fixed proxy.
+             *
+             * @return True if this is a fixed proxy, false otherwise.
+             **/
+            ice_isFixed():boolean;
+
+            /**
              * Obtains the Connection for this proxy. If the proxy does not yet have an established connection,
              * it first attempts to create a connection.
              * @return The asynchronous result object for the invocation.
@@ -380,7 +387,7 @@ declare module "ice"
             ice_isConnectionCached():boolean;
 
             /**
-             * Flushes any pending batched requests for this communicator. The call blocks until the flush is complete.
+             * Flushes any pending batched requests for this communicator.
              * @return The asynchronous result object for the invocation.
              */
             ice_flushBatchRequests():AsyncResult<void>;
diff --git a/js/src/Ice/ObjectPrx.js b/js/src/Ice/ObjectPrx.js
index e51fe929a00..a29698fe192 100644
--- a/js/src/Ice/ObjectPrx.js
+++ b/js/src/Ice/ObjectPrx.js
@@ -447,6 +447,11 @@ class ObjectPrx
         }
     }
 
+    ice_isFixed()
+    {
+        return this._reference instanceof Ice.FixedReference;
+    }
+
     ice_getConnectionId()
     {
         return this._reference.getConnectionId();
diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js
index 0ad59852ad5..e96681dc8e5 100644
--- a/js/test/Ice/proxy/Client.js
+++ b/js/test/Ice/proxy/Client.js
@@ -740,6 +740,8 @@
                 const connection = await cl.ice_getConnection();
                 if(connection !== null)
                 {
+                    test(!cl.ice_isFixed());
+                    test(cl.ice_fixed(connection).ice_isFixed());
                     await cl.ice_fixed(connection).getContext();
                     test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
                     test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet() == "facet");
diff --git a/js/test/typescript/Ice/proxy/Client.ts b/js/test/typescript/Ice/proxy/Client.ts
index 90827760bc5..9dc59b49ce5 100644
--- a/js/test/typescript/Ice/proxy/Client.ts
+++ b/js/test/typescript/Ice/proxy/Client.ts
@@ -739,6 +739,8 @@ export class Client extends TestHelper
             const connection = await cl.ice_getConnection();
             if(connection !== null)
             {
+                test(!cl.ice_isFixed());
+                test(cl.ice_fixed(connection).ice_isFixed());
                 await cl.ice_fixed(connection).getContext();
                 test(cl.ice_secure(true).ice_fixed(connection).ice_isSecure());
                 test(cl.ice_facet("facet").ice_fixed(connection).ice_getFacet() == "facet");