Update JS with the same OutgoingAsync fixes as C++/Java/C#

1 files changed, 6 insertions, 12 deletions

diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index b348b1c8cc8..c2c443f2184 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -78,12 +78,6 @@ ProxyOutgoingAsyncBase::getProxy() const
 }
 
 bool
-ProxyOutgoingAsyncBase::sent()
-{
-    return sent(!_proxy->ice_isTwoway()); // Done if it's not a two-way proxy (no response expected).
-}
-
-bool
 ProxyOutgoingAsyncBase::completed(const Exception& exc)
 {
     if(_childObserver)
@@ -391,6 +385,12 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
     }
 }
 
+bool
+OutgoingAsync::sent()
+{
+    return ProxyOutgoingAsyncBase::sent(!_proxy->ice_isTwoway()); // done = true if it's not a two-way proxy
+}
+
 AsyncStatus
 OutgoingAsync::send(const ConnectionIPtr& connection, bool compress, bool response)
 {
@@ -601,12 +601,6 @@ ProxyFlushBatch::ProxyFlushBatch(const ObjectPrx& proxy,
     _observer.attach(proxy.get(), operation, 0);
 }
 
-bool
-ProxyFlushBatch::sent()
-{
-    return ProxyOutgoingAsyncBase::sent(true); // Overriden because the flush is done even if using a two-way proxy.
-}
-
 AsyncStatus
 ProxyFlushBatch::send(const ConnectionIPtr& connection, bool, bool)
 {