ICE-6170 - fixed behavior of batch requests

author: Benoit Foucher <benoit@zeroc.com> 2015-03-10 12:12:10 +0100
committer: Benoit Foucher <benoit@zeroc.com> 2015-03-10 12:12:10 +0100
commit: c6ca68d97aa5bbc2a172e3e35171b5452657fa22 (patch)
tree: 46edcca4c8e313285a205bf6fad7c56c452c0cc0 /py
parent: Minor JS style fixes (diff)
download: ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.bz2
ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.xz
ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.zip
15 files changed, 1007 insertions, 469 deletions
diff --git a/py/demo/Glacier2/callback/Client.py b/py/demo/Glacier2/callback/Client.py
index 0dbbc410cfc..ae7b53ad694 100755
--- a/py/demo/Glacier2/callback/Client.py
+++ b/py/demo/Glacier2/callback/Client.py
@@ -105,7 +105,7 @@ class Client(Glacier2.Application):
                         context["_ovrd"] = override
                     batchOneway.initiateCallback(onewayR, context)
                 elif c == 'f':
-                    self.communicator().flushBatchRequests()
+                    batchOneway.ice_flushBatchRequests()
                 elif c == 'v':
                     if len(override) == 0:
                         override = "some_value"
diff --git a/py/demo/Ice/hello/Client.py b/py/demo/Ice/hello/Client.py
index 26716dc8186..4dbec55ef2a 100755
--- a/py/demo/Ice/hello/Client.py
+++ b/py/demo/Ice/hello/Client.py
@@ -76,7 +76,8 @@ class Client(Ice.Application):
                     else:
                         batchDatagram.sayHello(delay)
                 elif c == 'f':
-                    self.communicator().flushBatchRequests()
+                    batchOneway.ice_flushBatchRequests()
+                    batchDatagram.ice_flushBatchRequests()
                 elif c == 'T':
                     if timeout == -1:
                         timeout = 2000
diff --git a/py/demo/IceDiscovery/hello/Client.py b/py/demo/IceDiscovery/hello/Client.py
index a334db2cd49..d57d77d293b 100755
--- a/py/demo/IceDiscovery/hello/Client.py
+++ b/py/demo/IceDiscovery/hello/Client.py
@@ -38,7 +38,7 @@ class Client(Ice.Application):
 
         #
         # Create a well-known proxy for the `hello' Ice object. A well-known proxy
-        # only includes the Ice object identity. It's resolved using the Ice locator 
+        # only includes the Ice object identity. It's resolved using the Ice locator
         # implementation.
         #
         twoway = Demo.HelloPrx.checkedCast(\
@@ -81,7 +81,8 @@ class Client(Ice.Application):
                     else:
                         batchDatagram.sayHello(delay)
                 elif c == 'f':
-                    self.communicator().flushBatchRequests()
+                    batchOneway.ice_flushBatchRequests()
+                    batchDatagram.ice_flushBatchRequests()
                 elif c == 'T':
                     if timeout == -1:
                         timeout = 2000
diff --git a/py/modules/IcePy/.depend.mak b/py/modules/IcePy/.depend.mak
index d26da22cf29..f4834457aa7 100644
--- a/py/modules/IcePy/.depend.mak
+++ b/py/modules/IcePy/.depend.mak
@@ -1,4 +1,82 @@
 
+BatchRequestInterceptor.obj: \
+	BatchRequestInterceptor.cpp \
+    "$(ice_cpp_dir)\include\IceUtil\Config.h" \
+    "BatchRequestInterceptor.h" \
+    "Config.h" \
+    "Util.h" \
+    "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
+    "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
+    "$(ice_cpp_dir)\include\Ice\Config.h" \
+    "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Exception.h" \
+    "$(ice_cpp_dir)\include\Ice\ObjectF.h" \
+    "$(ice_cpp_dir)\include\Ice\Handle.h" \
+    "$(ice_cpp_dir)\include\Ice\Exception.h" \
+    "$(ice_cpp_dir)\include\Ice\Format.h" \
+    "$(ice_cpp_dir)\include\Ice\StreamF.h" \
+    "$(ice_cpp_dir)\include\Ice\LocalObject.h" \
+    "$(ice_cpp_dir)\include\Ice\LocalObjectF.h" \
+    "$(ice_cpp_dir)\include\Ice\StreamHelpers.h" \
+    "$(ice_cpp_dir)\include\IceUtil\ScopedArray.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
+    "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
+    "$(ice_cpp_dir)\include\Ice\Current.h" \
+    "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
+    "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
+    "$(ice_cpp_dir)\include\Ice\Identity.h" \
+    "$(ice_cpp_dir)\include\Ice\Version.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
+    "Proxy.h" \
+    "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
+    "Thread.h" \
+    "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Mutex.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Lock.h" \
+    "$(ice_cpp_dir)\include\IceUtil\ThreadException.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Time.h" \
+    "$(ice_cpp_dir)\include\IceUtil\MutexProtocol.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
+    "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
+    "$(ice_cpp_dir)\include\Ice\Proxy.h" \
+    "$(ice_cpp_dir)\include\Ice\ProxyFactoryF.h" \
+    "$(ice_cpp_dir)\include\Ice\ConnectionIF.h" \
+    "$(ice_cpp_dir)\include\Ice\RequestHandlerF.h" \
+    "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
+    "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
+    "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
+    "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
+    "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
+    "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
+    "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
+    "$(ice_cpp_dir)\include\Ice\Object.h" \
+    "$(ice_cpp_dir)\include\Ice\IncomingAsyncF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObjectFactoryF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObjectFactoryManagerF.h" \
+    "$(ice_cpp_dir)\include\Ice\Buffer.h" \
+    "$(ice_cpp_dir)\include\Ice\Protocol.h" \
+    "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
+    "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
+    "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
+    "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
+    "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
+    "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
+    "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+
 Communicator.obj: \
 	Communicator.cpp \
     "$(ice_cpp_dir)\include\IceUtil\Config.h" \
@@ -6,8 +84,10 @@ Communicator.obj: \
     "Communicator.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -24,17 +104,20 @@ Communicator.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
-    "ImplicitContext.h" \
-    "$(ice_cpp_dir)\include\Ice\ImplicitContext.h" \
-    "$(ice_cpp_dir)\include\Ice\LocalException.h" \
-    "$(ice_cpp_dir)\include\Ice\Identity.h" \
-    "$(ice_cpp_dir)\include\Ice\Version.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
+    "BatchRequestInterceptor.h" \
+    "Util.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
+    "$(ice_cpp_dir)\include\Ice\Identity.h" \
+    "$(ice_cpp_dir)\include\Ice\Version.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
+    "ImplicitContext.h" \
+    "$(ice_cpp_dir)\include\Ice\ImplicitContext.h" \
+    "$(ice_cpp_dir)\include\Ice\LocalException.h" \
     "Logger.h" \
-    "Util.h" \
     "$(ice_cpp_dir)\include\Ice\Logger.h" \
     "ObjectAdapter.h" \
     "ObjectFactory.h" \
@@ -47,7 +130,7 @@ Communicator.obj: \
     "Operation.h" \
     "$(ice_cpp_dir)\include\Ice\Object.h" \
     "$(ice_cpp_dir)\include\Ice\IncomingAsyncF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
     "Properties.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
     "$(ice_cpp_dir)\include\Ice\Proxy.h" \
@@ -57,13 +140,14 @@ Communicator.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
     "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectFactoryF.h" \
@@ -73,15 +157,11 @@ Communicator.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "PropertiesAdmin.h" \
     "$(ice_cpp_dir)\include\Ice\NativePropertiesAdmin.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesAdmin.h" \
     "$(ice_cpp_dir)\include\Ice\GCObject.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexPtrLock.h" \
-    "$(ice_cpp_dir)\include\Ice\Outgoing.h" \
     "$(ice_cpp_dir)\include\Ice\Incoming.h" \
     "$(ice_cpp_dir)\include\Ice\ServantLocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\ServantManagerF.h" \
@@ -90,6 +170,8 @@ Communicator.obj: \
     "Proxy.h" \
     "Thread.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
@@ -119,8 +201,10 @@ Connection.obj: \
     "Connection.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -137,6 +221,7 @@ Connection.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
     "Communicator.h" \
     "ConnectionInfo.h" \
@@ -154,14 +239,15 @@ Connection.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
     "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
@@ -176,9 +262,6 @@ Connection.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\Endpoint.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "Endpoint.h" \
@@ -188,11 +271,14 @@ Connection.obj: \
     "Thread.h" \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
     "Types.h" \
     "$(ice_cpp_dir)\include\Ice\Stream.h" \
     "$(ice_cpp_dir)\include\IceUtil\OutputUtil.h" \
@@ -204,8 +290,10 @@ ConnectionInfo.obj: \
     "ConnectionInfo.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\Connection.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -232,20 +320,22 @@ ConnectionInfo.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
     "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
-    "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
-    "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
+    "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
+    "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
@@ -259,9 +349,6 @@ ConnectionInfo.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\Endpoint.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "EndpointInfo.h" \
@@ -273,8 +360,10 @@ Current.obj: \
     "Current.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -292,6 +381,7 @@ Current.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
@@ -313,14 +403,15 @@ Current.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
     "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\Object.h" \
@@ -332,9 +423,6 @@ Current.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\ServantLocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\LocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\FacetMap.h" \
@@ -346,8 +434,10 @@ Endpoint.obj: \
     "Endpoint.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\Endpoint.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -365,6 +455,7 @@ Endpoint.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "EndpointInfo.h" \
@@ -380,8 +471,10 @@ EndpointInfo.obj: \
     "EndpointInfo.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\Endpoint.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -399,6 +492,7 @@ EndpointInfo.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "Util.h" \
@@ -413,8 +507,10 @@ ImplicitContext.obj: \
     "ImplicitContext.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\ImplicitContext.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -433,6 +529,7 @@ ImplicitContext.obj: \
     "$(ice_cpp_dir)\include\Ice\LocalException.h" \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
@@ -446,11 +543,14 @@ ImplicitContext.obj: \
 Init.obj: \
 	Init.cpp \
     "$(ice_cpp_dir)\include\IceUtil\Config.h" \
-    "Communicator.h" \
+    "BatchRequestInterceptor.h" \
     "Config.h" \
-    "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
+    "Util.h" \
+    "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -467,8 +567,16 @@ Init.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
-    "Connection.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
+    "$(ice_cpp_dir)\include\Ice\Current.h" \
+    "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
+    "$(ice_cpp_dir)\include\Ice\Identity.h" \
+    "$(ice_cpp_dir)\include\Ice\Version.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
+    "Communicator.h" \
+    "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
+    "Connection.h" \
     "ConnectionInfo.h" \
     "$(ice_cpp_dir)\include\Ice\Connection.h" \
     "$(ice_cpp_dir)\include\Ice\Proxy.h" \
@@ -482,19 +590,16 @@ Init.obj: \
     "$(ice_cpp_dir)\include\Ice\RequestHandlerF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
-    "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
     "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
-    "$(ice_cpp_dir)\include\Ice\Current.h" \
-    "$(ice_cpp_dir)\include\Ice\Identity.h" \
-    "$(ice_cpp_dir)\include\Ice\Version.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\Object.h" \
@@ -506,11 +611,7 @@ Init.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\Endpoint.h" \
-    "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "Current.h" \
     "Endpoint.h" \
     "EndpointInfo.h" \
@@ -518,7 +619,6 @@ Init.obj: \
     "$(ice_cpp_dir)\include\Ice\ImplicitContext.h" \
     "$(ice_cpp_dir)\include\Ice\LocalException.h" \
     "Logger.h" \
-    "Util.h" \
     "$(ice_cpp_dir)\include\Ice\Logger.h" \
     "ObjectAdapter.h" \
     "Operation.h" \
@@ -529,7 +629,6 @@ Init.obj: \
     "$(ice_cpp_dir)\include\Ice\PropertiesAdmin.h" \
     "$(ice_cpp_dir)\include\Ice\GCObject.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexPtrLock.h" \
-    "$(ice_cpp_dir)\include\Ice\Outgoing.h" \
     "$(ice_cpp_dir)\include\Ice\Incoming.h" \
     "$(ice_cpp_dir)\include\Ice\ServantLocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\ServantManagerF.h" \
@@ -540,6 +639,13 @@ Init.obj: \
     "Types.h" \
     "$(ice_cpp_dir)\include\Ice\Stream.h" \
     "$(ice_cpp_dir)\include\IceUtil\OutputUtil.h" \
+    "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
+    "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
+    "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
+    "$(ice_cpp_dir)\include\Ice\Plugin.h" \
 
 Logger.obj: \
 	Logger.cpp \
@@ -548,8 +654,10 @@ Logger.obj: \
     "Config.h" \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -566,6 +674,7 @@ Logger.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
@@ -574,28 +683,31 @@ Logger.obj: \
     "$(ice_cpp_dir)\include\Ice\Logger.h" \
     "Thread.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
-    "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
-    "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
-    "$(ice_cpp_dir)\include\Ice\Proxy.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\Mutex.h" \
     "$(ice_cpp_dir)\include\IceUtil\Lock.h" \
     "$(ice_cpp_dir)\include\IceUtil\ThreadException.h" \
     "$(ice_cpp_dir)\include\IceUtil\Time.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexProtocol.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
+    "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
+    "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
+    "$(ice_cpp_dir)\include\Ice\Proxy.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyFactoryF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionIF.h" \
     "$(ice_cpp_dir)\include\Ice\RequestHandlerF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\Object.h" \
@@ -607,13 +719,11 @@ Logger.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
 
 ObjectAdapter.obj: \
 	ObjectAdapter.cpp \
@@ -621,8 +731,10 @@ ObjectAdapter.obj: \
     "ObjectAdapter.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -639,6 +751,7 @@ ObjectAdapter.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "Communicator.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
     "Current.h" \
@@ -658,11 +771,15 @@ ObjectAdapter.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Time.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexProtocol.h" \
     "$(ice_cpp_dir)\include\Ice\IncomingAsyncF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
     "Proxy.h" \
     "Thread.h" \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
     "$(ice_cpp_dir)\include\Ice\Proxy.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyFactoryF.h" \
@@ -670,13 +787,12 @@ ObjectAdapter.obj: \
     "$(ice_cpp_dir)\include\Ice\RequestHandlerF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectFactoryF.h" \
@@ -686,20 +802,17 @@ ObjectAdapter.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
     "Types.h" \
     "$(ice_cpp_dir)\include\Ice\Stream.h" \
     "$(ice_cpp_dir)\include\IceUtil\OutputUtil.h" \
     "$(ice_cpp_dir)\include\Ice\Communicator.h" \
     "$(ice_cpp_dir)\include\Ice\GCObject.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexPtrLock.h" \
-    "$(ice_cpp_dir)\include\Ice\Outgoing.h" \
     "$(ice_cpp_dir)\include\Ice\Incoming.h" \
     "$(ice_cpp_dir)\include\Ice\ServantLocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\ServantManagerF.h" \
@@ -729,11 +842,13 @@ ObjectFactory.obj: \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Handle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Exception.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectFactory.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\Ice\Exception.h" \
@@ -746,6 +861,7 @@ ObjectFactory.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\IceUtil\Mutex.h" \
     "$(ice_cpp_dir)\include\IceUtil\Lock.h" \
     "$(ice_cpp_dir)\include\IceUtil\ThreadException.h" \
@@ -760,6 +876,10 @@ ObjectFactory.obj: \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
     "$(ice_cpp_dir)\include\Ice\Proxy.h" \
@@ -769,14 +889,13 @@ ObjectFactory.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\Object.h" \
@@ -788,13 +907,11 @@ ObjectFactory.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
     "Types.h" \
     "$(ice_cpp_dir)\include\Ice\Stream.h" \
     "$(ice_cpp_dir)\include\IceUtil\OutputUtil.h" \
@@ -806,8 +923,10 @@ Operation.obj: \
     "Operation.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -825,6 +944,7 @@ Operation.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
@@ -835,7 +955,7 @@ Operation.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Time.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexProtocol.h" \
     "$(ice_cpp_dir)\include\Ice\IncomingAsyncF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
     "Communicator.h" \
     "Current.h" \
@@ -844,6 +964,10 @@ Operation.obj: \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
     "$(ice_cpp_dir)\include\Ice\Proxy.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyFactoryF.h" \
@@ -852,13 +976,12 @@ Operation.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectFactoryF.h" \
@@ -868,13 +991,11 @@ Operation.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
     "Types.h" \
     "$(ice_cpp_dir)\include\Ice\Stream.h" \
     "$(ice_cpp_dir)\include\IceUtil\OutputUtil.h" \
@@ -882,7 +1003,6 @@ Operation.obj: \
     "$(ice_cpp_dir)\include\Ice\Communicator.h" \
     "$(ice_cpp_dir)\include\Ice\GCObject.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexPtrLock.h" \
-    "$(ice_cpp_dir)\include\Ice\Outgoing.h" \
     "$(ice_cpp_dir)\include\Ice\Incoming.h" \
     "$(ice_cpp_dir)\include\Ice\ServantLocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\ServantManagerF.h" \
@@ -908,8 +1028,10 @@ Properties.obj: \
     "Properties.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -936,20 +1058,22 @@ Properties.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
     "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
-    "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
-    "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
+    "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
+    "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
@@ -963,20 +1087,19 @@ Properties.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
     "$(ice_cpp_dir)\include\Ice\Properties.h" \
     "$(ice_cpp_dir)\include\Ice\GCObject.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexPtrLock.h" \
-    "$(ice_cpp_dir)\include\Ice\Outgoing.h" \
     "$(ice_cpp_dir)\include\Ice\Incoming.h" \
     "$(ice_cpp_dir)\include\Ice\ServantLocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\ServantManagerF.h" \
@@ -992,8 +1115,10 @@ PropertiesAdmin.obj: \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\NativePropertiesAdmin.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesAdmin.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -1020,20 +1145,22 @@ PropertiesAdmin.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
     "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
-    "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
-    "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
+    "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
+    "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
@@ -1047,12 +1174,8 @@ PropertiesAdmin.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\GCObject.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexPtrLock.h" \
-    "$(ice_cpp_dir)\include\Ice\Outgoing.h" \
     "$(ice_cpp_dir)\include\Ice\Incoming.h" \
     "$(ice_cpp_dir)\include\Ice\ServantLocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\ServantManagerF.h" \
@@ -1062,11 +1185,14 @@ PropertiesAdmin.obj: \
     "Util.h" \
     "Thread.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
     "Types.h" \
     "$(ice_cpp_dir)\include\Ice\Stream.h" \
     "$(ice_cpp_dir)\include\IceUtil\OutputUtil.h" \
@@ -1079,11 +1205,13 @@ Proxy.obj: \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Exception.h" \
     "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectF.h" \
     "$(ice_cpp_dir)\include\Ice\Handle.h" \
     "$(ice_cpp_dir)\include\Ice\Exception.h" \
@@ -1096,6 +1224,7 @@ Proxy.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "Communicator.h" \
     "Connection.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
@@ -1115,10 +1244,14 @@ Proxy.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Time.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexProtocol.h" \
     "$(ice_cpp_dir)\include\Ice\IncomingAsyncF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
     "Thread.h" \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
     "$(ice_cpp_dir)\include\Ice\Proxy.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyFactoryF.h" \
@@ -1126,13 +1259,12 @@ Proxy.obj: \
     "$(ice_cpp_dir)\include\Ice\RequestHandlerF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectFactoryF.h" \
@@ -1142,17 +1274,14 @@ Proxy.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
     "$(ice_cpp_dir)\include\Ice\Communicator.h" \
     "$(ice_cpp_dir)\include\Ice\GCObject.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexPtrLock.h" \
-    "$(ice_cpp_dir)\include\Ice\Outgoing.h" \
     "$(ice_cpp_dir)\include\Ice\Incoming.h" \
     "$(ice_cpp_dir)\include\Ice\ServantLocatorF.h" \
     "$(ice_cpp_dir)\include\Ice\ServantManagerF.h" \
@@ -1180,8 +1309,10 @@ Slice.obj: \
     "Config.h" \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -1198,6 +1329,7 @@ Slice.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
@@ -1207,6 +1339,7 @@ Slice.obj: \
     "$(ice_cpp_dir)\include\Slice\PythonUtil.h" \
     "$(ice_cpp_dir)\include\Slice\Parser.h" \
     "$(ice_cpp_dir)\include\IceUtil\OutputUtil.h" \
+    "$(ice_cpp_dir)\include\Slice\Util.h" \
     "$(ice_cpp_dir)\include\IceUtil\Options.h" \
     "$(ice_cpp_dir)\include\IceUtil\RecMutex.h" \
     "$(ice_cpp_dir)\include\IceUtil\Lock.h" \
@@ -1221,8 +1354,10 @@ Thread.obj: \
     "Config.h" \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -1239,34 +1374,38 @@ Thread.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
     "$(ice_cpp_dir)\include\Ice\Identity.h" \
     "$(ice_cpp_dir)\include\Ice\Version.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
-    "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
-    "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
-    "$(ice_cpp_dir)\include\Ice\Proxy.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\Mutex.h" \
     "$(ice_cpp_dir)\include\IceUtil\Lock.h" \
     "$(ice_cpp_dir)\include\IceUtil\ThreadException.h" \
     "$(ice_cpp_dir)\include\IceUtil\Time.h" \
     "$(ice_cpp_dir)\include\IceUtil\MutexProtocol.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
+    "$(ice_cpp_dir)\include\Ice\CommunicatorF.h" \
+    "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
+    "$(ice_cpp_dir)\include\Ice\Proxy.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyFactoryF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionIF.h" \
     "$(ice_cpp_dir)\include\Ice\RequestHandlerF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\Object.h" \
@@ -1278,13 +1417,11 @@ Thread.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
 
 Types.obj: \
 	Types.cpp \
@@ -1293,8 +1430,10 @@ Types.obj: \
     "Config.h" \
     "Util.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -1311,6 +1450,7 @@ Types.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
@@ -1332,14 +1472,15 @@ Types.obj: \
     "$(ice_cpp_dir)\include\Ice\EndpointF.h" \
     "$(ice_cpp_dir)\include\Ice\EndpointTypes.h" \
     "$(ice_cpp_dir)\include\Ice\ReferenceF.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsync.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestQueueF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResult.h" \
     "$(ice_cpp_dir)\include\IceUtil\Monitor.h" \
     "$(ice_cpp_dir)\include\IceUtil\Cond.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
-    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\IceUtil\UniquePtr.h" \
-    "$(ice_cpp_dir)\include\Ice\OutgoingAsyncF.h" \
     "$(ice_cpp_dir)\include\Ice\InstanceF.h" \
+    "$(ice_cpp_dir)\include\Ice\AsyncResultF.h" \
+    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
+    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
     "$(ice_cpp_dir)\include\Ice\BasicStream.h" \
     "$(ice_cpp_dir)\include\IceUtil\StringConverter.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectFactoryF.h" \
@@ -1349,19 +1490,19 @@ Types.obj: \
     "$(ice_cpp_dir)\include\Ice\SlicedDataF.h" \
     "$(ice_cpp_dir)\include\Ice\UserExceptionFactory.h" \
     "$(ice_cpp_dir)\include\Ice\FactoryTable.h" \
-    "$(ice_cpp_dir)\include\Ice\ObserverHelper.h" \
-    "$(ice_cpp_dir)\include\Ice\Instrumentation.h" \
-    "$(ice_cpp_dir)\include\Ice\ThreadPoolF.h" \
     "$(ice_cpp_dir)\include\IceUtil\OutputUtil.h" \
     "Current.h" \
     "Proxy.h" \
     "Thread.h" \
     "$(ice_cpp_dir)\include\Ice\Initialize.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Timer.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Thread.h" \
     "$(ice_cpp_dir)\include\Ice\PropertiesF.h" \
     "$(ice_cpp_dir)\include\Ice\LoggerF.h" \
     "$(ice_cpp_dir)\include\Ice\InstrumentationF.h" \
     "$(ice_cpp_dir)\include\Ice\Dispatcher.h" \
     "$(ice_cpp_dir)\include\Ice\Plugin.h" \
+    "$(ice_cpp_dir)\include\Ice\BatchRequestInterceptor.h" \
     "$(ice_cpp_dir)\include\IceUtil\InputUtil.h" \
     "$(ice_cpp_dir)\include\Ice\LocalException.h" \
     "$(ice_cpp_dir)\include\Ice\SlicedData.h" \
@@ -1374,8 +1515,10 @@ Util.obj: \
     "Util.h" \
     "Config.h" \
     "$(ice_cpp_dir)\include\Ice\BuiltinSequences.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PushDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyF.h" \
     "$(ice_cpp_dir)\include\IceUtil\Shared.h" \
+    "$(ice_cpp_dir)\include\IceUtil\Atomic.h" \
     "$(ice_cpp_dir)\include\Ice\Config.h" \
     "$(ice_cpp_dir)\include\Ice\ProxyHandle.h" \
     "$(ice_cpp_dir)\include\IceUtil\Handle.h" \
@@ -1392,6 +1535,7 @@ Util.obj: \
     "$(ice_cpp_dir)\include\IceUtil\Iterator.h" \
     "$(ice_cpp_dir)\include\IceUtil\Optional.h" \
     "$(ice_cpp_dir)\include\IceUtil\UndefSysMacros.h" \
+    "$(ice_cpp_dir)\include\IceUtil\PopDisableWarnings.h" \
     "$(ice_cpp_dir)\include\Ice\Current.h" \
     "$(ice_cpp_dir)\include\Ice\ObjectAdapterF.h" \
     "$(ice_cpp_dir)\include\Ice\ConnectionF.h" \
diff --git a/py/modules/IcePy/BatchRequestInterceptor.cpp b/py/modules/IcePy/BatchRequestInterceptor.cpp
new file mode 100644
index 00000000000..d2a16905267
--- /dev/null
+++ b/py/modules/IcePy/BatchRequestInterceptor.cpp
@@ -0,0 +1,264 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifdef _WIN32
+#   include <IceUtil/Config.h>
+#endif
+#include <BatchRequestInterceptor.h>
+#include <Proxy.h>
+#include <Thread.h>
+#include <Ice/Initialize.h>
+
+using namespace std;
+using namespace IcePy;
+
+namespace IcePy
+{
+
+struct BatchRequestObject
+{
+    PyObject_HEAD
+    const Ice::BatchRequest* request;
+    PyObject* size;
+    PyObject* operation;
+    PyObject* proxy;
+};
+
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static BatchRequestObject*
+batchRequestNew(PyTypeObject* /*type*/, PyObject* /*args*/, PyObject* /*kwds*/)
+{
+    PyErr_Format(PyExc_RuntimeError, STRCAST("Batch requests can only be created by the Ice runtime"));
+    return 0;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static void
+batchRequestDealloc(BatchRequestObject* self)
+{
+    Py_XDECREF(self->size);
+    Py_XDECREF(self->operation);
+    Py_XDECREF(self->proxy);
+    Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+batchRequestGetSize(BatchRequestObject* self)
+{
+    assert(self->request);
+    if(!self->size)
+    {
+        Ice::Int size;
+        try
+        {
+            size = self->request->getSize();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            setPythonException(ex);
+            return 0;
+        }
+
+        self->size = PyLong_FromLong(size);
+    }
+    Py_INCREF(self->size);
+    return self->size;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+batchRequestGetOperation(BatchRequestObject* self)
+{
+    assert(self->request);
+    if(!self->operation)
+    {
+        string operation;
+        try
+        {
+            operation = self->request->getOperation();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            setPythonException(ex);
+            return 0;
+        }
+
+        self->operation = createString(operation);
+    }
+    Py_INCREF(self->operation);
+    return self->operation;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+batchRequestGetProxy(BatchRequestObject* self)
+{
+    assert(self->request);
+    if(!self->proxy)
+    {
+        Ice::ObjectPrx proxy;
+        try
+        {
+            proxy = self->request->getProxy();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            setPythonException(ex);
+            return 0;
+        }
+
+        self->proxy = createProxy(proxy, proxy->ice_getCommunicator());
+    }
+    Py_INCREF(self->proxy);
+    return self->proxy;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+batchRequestEnqueue(BatchRequestObject* self)
+{
+    assert(self->request);
+
+    try
+    {
+        self->request->enqueue();
+    }
+    catch(const Ice::Exception& ex)
+    {
+        setPythonException(ex);
+        return 0;
+    }
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyMethodDef BatchRequestMethods[] =
+{
+    { STRCAST("getSize"), reinterpret_cast<PyCFunction>(batchRequestGetSize), METH_NOARGS,
+        PyDoc_STR(STRCAST("getSize() -> int")) },
+    { STRCAST("getOperation"), reinterpret_cast<PyCFunction>(batchRequestGetOperation), METH_NOARGS,
+        PyDoc_STR(STRCAST("getOperation() -> string")) },
+    { STRCAST("getProxy"), reinterpret_cast<PyCFunction>(batchRequestGetProxy), METH_NOARGS,
+        PyDoc_STR(STRCAST("getProxy() -> Ice.ObjectPrx")) },
+    { STRCAST("enqueue"), reinterpret_cast<PyCFunction>(batchRequestEnqueue), METH_NOARGS,
+        PyDoc_STR(STRCAST("enqueue() -> None")) },
+    { 0, 0 } /* sentinel */
+};
+
+namespace IcePy
+{
+
+PyTypeObject BatchRequestType =
+{
+    /* The ob_type field must be initialized in the module init function
+     * to be portable to Windows without using C++. */
+    PyVarObject_HEAD_INIT(0, 0)
+    STRCAST("IcePy.BatchRequest"),        /* tp_name */
+    sizeof(BatchRequestObject),           /* tp_basicsize */
+    0,                                    /* tp_itemsize */
+    /* methods */
+    reinterpret_cast<destructor>(batchRequestDealloc), /* tp_dealloc */
+    0,                               /* tp_print */
+    0,                               /* tp_getattr */
+    0,                               /* tp_setattr */
+    0,                               /* tp_reserved */
+    0,                               /* tp_repr */
+    0,                               /* tp_as_number */
+    0,                               /* tp_as_sequence */
+    0,                               /* tp_as_mapping */
+    0,                               /* tp_hash */
+    0,                               /* tp_call */
+    0,                               /* tp_str */
+    0,                               /* tp_getattro */
+    0,                               /* tp_setattro */
+    0,                               /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,              /* tp_flags */
+    0,                               /* tp_doc */
+    0,                               /* tp_traverse */
+    0,                               /* tp_clear */
+    0,                               /* tp_richcompare */
+    0,                               /* tp_weaklistoffset */
+    0,                               /* tp_iter */
+    0,                               /* tp_iternext */
+    BatchRequestMethods,             /* tp_methods */
+    0,                               /* tp_members */
+    0,                               /* tp_getset */
+    0,                               /* tp_base */
+    0,                               /* tp_dict */
+    0,                               /* tp_descr_get */
+    0,                               /* tp_descr_set */
+    0,                               /* tp_dictoffset */
+    0,                               /* tp_init */
+    0,                               /* tp_alloc */
+    reinterpret_cast<newfunc>(batchRequestNew), /* tp_new */
+    0,                               /* tp_free */
+    0,                               /* tp_is_gc */
+};
+
+}
+
+bool
+IcePy::initBatchRequest(PyObject* module)
+{
+    if(PyType_Ready(&BatchRequestType) < 0)
+    {
+        return false;
+    }
+    PyTypeObject* type = &BatchRequestType; // Necessary to prevent GCC's strict-alias warnings.
+    if(PyModule_AddObject(module, STRCAST("BatchRequest"), reinterpret_cast<PyObject*>(type)) < 0)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+IcePy::BatchRequestInterceptor::BatchRequestInterceptor(PyObject* interceptor) : _interceptor(interceptor)
+{
+    Py_INCREF(interceptor);
+}
+
+void
+IcePy::BatchRequestInterceptor::enqueue(const Ice::BatchRequest& request, int queueCount, int queueSize)
+{
+    AdoptThread adoptThread; // Ensure the current thread is able to call into Python.
+
+    BatchRequestObject* obj = reinterpret_cast<BatchRequestObject*>(BatchRequestType.tp_alloc(&BatchRequestType, 0));
+    if(!obj)
+    {
+        return;
+    }
+
+    obj->request = &request;
+    obj->size = 0;
+    obj->operation = 0;
+    obj->proxy = 0;
+    PyObjectHandle tmp = PyObject_CallMethod(_interceptor.get(), STRCAST("enqueue"), STRCAST("Oii"), obj, queueCount,
+                                             queueSize);
+    if(!tmp.get())
+    {
+        throwPythonException();
+    }
+}
diff --git a/py/modules/IcePy/BatchRequestInterceptor.h b/py/modules/IcePy/BatchRequestInterceptor.h
new file mode 100644
index 00000000000..53491ab7cb3
--- /dev/null
+++ b/py/modules/IcePy/BatchRequestInterceptor.h
@@ -0,0 +1,40 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEPY_BATCH_REQUEST_INTERCEPTOR_H
+#define ICEPY_BATCH_REQUEST_INTERCEPTOR_H
+
+#include <Config.h>
+#include <Util.h>
+#include <Ice/BatchRequestInterceptor.h>
+
+namespace IcePy
+{
+
+extern PyTypeObject BatchRequestType;
+
+bool initBatchRequest(PyObject*);
+
+class BatchRequestInterceptor : public Ice::BatchRequestInterceptor
+{
+public:
+
+    BatchRequestInterceptor(PyObject*);
+
+    virtual void enqueue(const Ice::BatchRequest&, int, int);
+
+private:
+
+    PyObjectHandle _interceptor;
+};
+typedef IceUtil::Handle<BatchRequestInterceptor> BatchRequestInterceptorPtr;
+
+}
+
+#endif
diff --git a/py/modules/IcePy/Communicator.cpp b/py/modules/IcePy/Communicator.cpp
index 58eb9a3660a..919086d9ae8 100644
--- a/py/modules/IcePy/Communicator.cpp
+++ b/py/modules/IcePy/Communicator.cpp
@@ -12,6 +12,7 @@
 #endif
 #include <IceUtil/DisableWarnings.h>
 #include <Communicator.h>
+#include <BatchRequestInterceptor.h>
 #include <ImplicitContext.h>
 #include <Logger.h>
 #include <ObjectAdapter.h>
@@ -145,6 +146,7 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/)
         PyObjectHandle properties = PyObject_GetAttrString(initData, STRCAST("properties"));
         PyObjectHandle logger = PyObject_GetAttrString(initData, STRCAST("logger"));
         PyObjectHandle threadHook = PyObject_GetAttrString(initData, STRCAST("threadHook"));
+        PyObjectHandle batchRequestInterceptor = PyObject_GetAttrString(initData, STRCAST("batchRequestInterceptor"));
         PyErr_Clear(); // PyObject_GetAttrString sets an error on failure.
 
         if(properties.get() && properties.get() != Py_None)
@@ -166,6 +168,11 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/)
         {
             data.threadHook = new ThreadHook(threadHook.get());
         }
+
+        if(batchRequestInterceptor.get() && batchRequestInterceptor.get() != Py_None)
+        {
+            data.batchRequestInterceptor = new BatchRequestInterceptor(batchRequestInterceptor.get());
+        }
     }
 
     try
@@ -224,7 +231,7 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/)
         setPythonException(ex);
         return -1;
     }
-    
+
     //
     // Replace the contents of the given argument list with the filtered arguments.
     //
@@ -387,7 +394,7 @@ communicatorWaitForShutdown(CommunicatorObject* self, PyObject* args)
                     AllowThreads allowThreads; // Release Python's global interpreter lock during blocking calls.
                     done = (*self->shutdownMonitor).timedWait(IceUtil::Time::milliSeconds(timeout));
                 }
-                
+
                 if(!done)
                 {
                     PyRETURN_FALSE;
@@ -831,7 +838,7 @@ communicatorCreateAdmin(CommunicatorObject* self, PyObject* args)
     {
         proxy = (*self->communicator)->createAdmin(oa, identity);
         assert(proxy);
-        
+
         return createProxy(proxy, *self->communicator);
     }
     catch(const Ice::Exception& ex)
@@ -995,7 +1002,7 @@ communicatorFindAllAdminFacets(CommunicatorObject* self)
 
     for(Ice::FacetMap::const_iterator p = facetMap.begin(); p != facetMap.end(); ++p)
     {
-        
+
         PyObjectHandle obj = plainObject;
 
         ServantWrapperPtr wrapper = ServantWrapperPtr::dynamicCast(p->second);
@@ -1011,7 +1018,7 @@ communicatorFindAllAdminFacets(CommunicatorObject* self)
                 obj = createNativePropertiesAdmin(props);
             }
         }
-        
+
         if(PyDict_SetItemString(result.get(), const_cast<char*>(p->first.c_str()), obj.get()) < 0)
         {
             return 0;
@@ -1239,7 +1246,7 @@ static PyObject*
 communicatorGetImplicitContext(CommunicatorObject* self)
 {
     Ice::ImplicitContextPtr implicitContext = (*self->communicator)->getImplicitContext();
-    
+
     if(implicitContext == 0)
     {
         Py_INCREF(Py_None);
diff --git a/py/modules/IcePy/Init.cpp b/py/modules/IcePy/Init.cpp
index 4a5c0018a30..4de906407c4 100644
--- a/py/modules/IcePy/Init.cpp
+++ b/py/modules/IcePy/Init.cpp
@@ -10,6 +10,7 @@
 #ifdef _WIN32
 #   include <IceUtil/Config.h>
 #endif
+#include <BatchRequestInterceptor.h>
 #include <Communicator.h>
 #include <Connection.h>
 #include <ConnectionInfo.h>
@@ -182,6 +183,10 @@ initIcePy(void)
     {
         INIT_RETURN;
     }
+    if(!initBatchRequest(module))
+    {
+        INIT_RETURN;
+    }
     if(!initCommunicator(module))
     {
         INIT_RETURN;
diff --git a/py/modules/IcePy/Makefile b/py/modules/IcePy/Makefile
index 89df5649159..3efba732368 100644
--- a/py/modules/IcePy/Makefile
+++ b/py/modules/IcePy/Makefile
@@ -10,12 +10,13 @@
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mkpylibfilename,IcePy,$(VERSION))
-SONAME          = $(call mkpysoname,IcePy,$(SOVERSION))  
+SONAME          = $(call mkpysoname,IcePy,$(SOVERSION))
 LIBNAME		= $(call mkpylibname,IcePy)
 
 TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
 
-OBJS		= Communicator.o \
+OBJS		= BatchRequestInterceptor.o \
+	      Communicator.o \
 		  Connection.o \
 		  ConnectionInfo.o \
 		  Current.o \
diff --git a/py/modules/IcePy/Makefile.mak b/py/modules/IcePy/Makefile.mak
index d914565de97..f39e162a31d 100644
--- a/py/modules/IcePy/Makefile.mak
+++ b/py/modules/IcePy/Makefile.mak
@@ -14,7 +14,8 @@ DLLNAME		= $(top_srcdir)\python\IcePy$(PYLIBSUFFIX).pyd
 
 TARGETS		= $(LIBNAME) $(DLLNAME)
 
-OBJS		= .\Communicator.obj \
+OBJS		= .\BatchRequestInterceptor.obj \
+		  .\Communicator.obj \
 		  .\Connection.obj \
 		  .\ConnectionInfo.obj \
 		  .\Current.obj \
diff --git a/py/python/.depend.mak b/py/python/.depend.mak
index e41cdc88afa..e46e1645583 100644
--- a/py/python/.depend.mak
+++ b/py/python/.depend.mak
@@ -1,331 +1,331 @@
 
 Ice_BuiltinSequences_ice.py: \
-    $(slicedir)\Ice\BuiltinSequences.ice
+    "$(slicedir)\Ice\BuiltinSequences.ice"
 
 Ice_Communicator_ice.py: \
-    $(slicedir)\Ice\Communicator.ice \
-    $(slicedir)/Ice/LoggerF.ice \
-    $(slicedir)/Ice/InstrumentationF.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/ObjectFactoryF.ice \
-    $(slicedir)/Ice/RouterF.ice \
-    $(slicedir)/Ice/LocatorF.ice \
-    $(slicedir)/Ice/PluginF.ice \
-    $(slicedir)/Ice/ImplicitContextF.ice \
-    $(slicedir)/Ice/Current.ice \
-    $(slicedir)/Ice/ConnectionF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/FacetMap.ice
+    "$(slicedir)\Ice\Communicator.ice" \
+    "$(slicedir)/Ice/LoggerF.ice" \
+    "$(slicedir)/Ice/InstrumentationF.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/ObjectFactoryF.ice" \
+    "$(slicedir)/Ice/RouterF.ice" \
+    "$(slicedir)/Ice/LocatorF.ice" \
+    "$(slicedir)/Ice/PluginF.ice" \
+    "$(slicedir)/Ice/ImplicitContextF.ice" \
+    "$(slicedir)/Ice/Current.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/FacetMap.ice"
 
 Ice_CommunicatorF_ice.py: \
-    $(slicedir)\Ice\CommunicatorF.ice
+    "$(slicedir)\Ice\CommunicatorF.ice"
 
 Ice_Connection_ice.py: \
-    $(slicedir)\Ice\Connection.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Endpoint.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/EndpointF.ice
+    "$(slicedir)\Ice\Connection.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Endpoint.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/EndpointF.ice"
 
 Ice_ConnectionF_ice.py: \
-    $(slicedir)\Ice\ConnectionF.ice
+    "$(slicedir)\Ice\ConnectionF.ice"
 
 Ice_Current_ice.py: \
-    $(slicedir)\Ice\Current.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/ConnectionF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice
+    "$(slicedir)\Ice\Current.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice"
 
 Ice_Endpoint_ice.py: \
-    $(slicedir)\Ice\Endpoint.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/EndpointF.ice
+    "$(slicedir)\Ice\Endpoint.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/EndpointF.ice"
 
 Ice_EndpointF_ice.py: \
-    $(slicedir)\Ice\EndpointF.ice
+    "$(slicedir)\Ice\EndpointF.ice"
 
 Ice_EndpointTypes_ice.py: \
-    $(slicedir)\Ice\EndpointTypes.ice
+    "$(slicedir)\Ice\EndpointTypes.ice"
 
 Ice_FacetMap_ice.py: \
-    $(slicedir)\Ice\FacetMap.ice
+    "$(slicedir)\Ice\FacetMap.ice"
 
 Ice_Identity_ice.py: \
-    $(slicedir)\Ice\Identity.ice
+    "$(slicedir)\Ice\Identity.ice"
 
 Ice_ImplicitContext_ice.py: \
-    $(slicedir)\Ice\ImplicitContext.ice \
-    $(slicedir)/Ice/LocalException.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Current.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/ConnectionF.ice
+    "$(slicedir)\Ice\ImplicitContext.ice" \
+    "$(slicedir)/Ice/LocalException.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Current.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice"
 
 Ice_ImplicitContextF_ice.py: \
-    $(slicedir)\Ice\ImplicitContextF.ice
+    "$(slicedir)\Ice\ImplicitContextF.ice"
 
 Ice_Instrumentation_ice.py: \
-    $(slicedir)\Ice\Instrumentation.ice \
-    $(slicedir)/Ice/EndpointF.ice \
-    $(slicedir)/Ice/ConnectionF.ice \
-    $(slicedir)/Ice/Current.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice
+    "$(slicedir)\Ice\Instrumentation.ice" \
+    "$(slicedir)/Ice/EndpointF.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice" \
+    "$(slicedir)/Ice/Current.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice"
 
 Ice_InstrumentationF_ice.py: \
-    $(slicedir)\Ice\InstrumentationF.ice
+    "$(slicedir)\Ice\InstrumentationF.ice"
 
 Ice_LocalException_ice.py: \
-    $(slicedir)\Ice\LocalException.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\LocalException.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_Locator_ice.py: \
-    $(slicedir)\Ice\Locator.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/ProcessF.ice
+    "$(slicedir)\Ice\Locator.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/ProcessF.ice"
 
 Ice_LocatorF_ice.py: \
-    $(slicedir)\Ice\LocatorF.ice
+    "$(slicedir)\Ice\LocatorF.ice"
 
 Ice_Logger_ice.py: \
-    $(slicedir)\Ice\Logger.ice
+    "$(slicedir)\Ice\Logger.ice"
 
 Ice_LoggerF_ice.py: \
-    $(slicedir)\Ice\LoggerF.ice
+    "$(slicedir)\Ice\LoggerF.ice"
 
 Ice_Metrics_ice.py: \
-    $(slicedir)\Ice\Metrics.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\Metrics.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_ObjectAdapter_ice.py: \
-    $(slicedir)\Ice\ObjectAdapter.ice \
-    $(slicedir)/Ice/CommunicatorF.ice \
-    $(slicedir)/Ice/ServantLocatorF.ice \
-    $(slicedir)/Ice/LocatorF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/FacetMap.ice \
-    $(slicedir)/Ice/Endpoint.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/EndpointF.ice
+    "$(slicedir)\Ice\ObjectAdapter.ice" \
+    "$(slicedir)/Ice/CommunicatorF.ice" \
+    "$(slicedir)/Ice/ServantLocatorF.ice" \
+    "$(slicedir)/Ice/LocatorF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/FacetMap.ice" \
+    "$(slicedir)/Ice/Endpoint.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/EndpointF.ice"
 
 Ice_ObjectAdapterF_ice.py: \
-    $(slicedir)\Ice\ObjectAdapterF.ice
+    "$(slicedir)\Ice\ObjectAdapterF.ice"
 
 Ice_ObjectFactory_ice.py: \
-    $(slicedir)\Ice\ObjectFactory.ice
+    "$(slicedir)\Ice\ObjectFactory.ice"
 
 Ice_ObjectFactoryF_ice.py: \
-    $(slicedir)\Ice\ObjectFactoryF.ice
+    "$(slicedir)\Ice\ObjectFactoryF.ice"
 
 Ice_Plugin_ice.py: \
-    $(slicedir)\Ice\Plugin.ice \
-    $(slicedir)/Ice/LoggerF.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\Plugin.ice" \
+    "$(slicedir)/Ice/LoggerF.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_PluginF_ice.py: \
-    $(slicedir)\Ice\PluginF.ice
+    "$(slicedir)\Ice\PluginF.ice"
 
 Ice_Process_ice.py: \
-    $(slicedir)\Ice\Process.ice
+    "$(slicedir)\Ice\Process.ice"
 
 Ice_ProcessF_ice.py: \
-    $(slicedir)\Ice\ProcessF.ice
+    "$(slicedir)\Ice\ProcessF.ice"
 
 Ice_Properties_ice.py: \
-    $(slicedir)\Ice\Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_PropertiesAdmin_ice.py: \
-    $(slicedir)\Ice\PropertiesAdmin.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_PropertiesF_ice.py: \
-    $(slicedir)\Ice\PropertiesF.ice
+    "$(slicedir)\Ice\PropertiesF.ice"
 
 Ice_Router_ice.py: \
-    $(slicedir)\Ice\Router.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\Router.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_RouterF_ice.py: \
-    $(slicedir)\Ice\RouterF.ice
+    "$(slicedir)\Ice\RouterF.ice"
 
 Ice_ServantLocator_ice.py: \
-    $(slicedir)\Ice\ServantLocator.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/Current.ice \
-    $(slicedir)/Ice/ConnectionF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice
+    "$(slicedir)\Ice\ServantLocator.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/Current.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice"
 
 Ice_ServantLocatorF_ice.py: \
-    $(slicedir)\Ice\ServantLocatorF.ice
+    "$(slicedir)\Ice\ServantLocatorF.ice"
 
 Ice_SliceChecksumDict_ice.py: \
-    $(slicedir)\Ice\SliceChecksumDict.ice
+    "$(slicedir)\Ice\SliceChecksumDict.ice"
 
 Ice_Version_ice.py: \
-    $(slicedir)\Ice\Version.ice
+    "$(slicedir)\Ice\Version.ice"
 
 Glacier2_Metrics_ice.py: \
-    $(slicedir)\Glacier2\Metrics.ice \
-    $(slicedir)/Ice/Metrics.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Glacier2\Metrics.ice" \
+    "$(slicedir)/Ice/Metrics.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Glacier2_PermissionsVerifier_ice.py: \
-    $(slicedir)\Glacier2\PermissionsVerifier.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Glacier2\PermissionsVerifier.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Glacier2_PermissionsVerifierF_ice.py: \
-    $(slicedir)\Glacier2\PermissionsVerifierF.ice
+    "$(slicedir)\Glacier2\PermissionsVerifierF.ice"
 
 Glacier2_Router_ice.py: \
-    $(slicedir)\Glacier2\Router.ice \
-    $(slicedir)/Ice/Router.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/Glacier2/PermissionsVerifier.ice
+    "$(slicedir)\Glacier2\Router.ice" \
+    "$(slicedir)/Ice/Router.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/Glacier2/PermissionsVerifier.ice"
 
 Glacier2_RouterF_ice.py: \
-    $(slicedir)\Glacier2\RouterF.ice
+    "$(slicedir)\Glacier2\RouterF.ice"
 
 Glacier2_Session_ice.py: \
-    $(slicedir)\Glacier2\Session.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice
+    "$(slicedir)\Glacier2\Session.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice"
 
 Glacier2_SSLInfo_ice.py: \
-    $(slicedir)\Glacier2\SSLInfo.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Glacier2\SSLInfo.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceBox_IceBox_ice.py: \
-    $(slicedir)\IceBox\IceBox.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/CommunicatorF.ice \
-    $(slicedir)/Ice/PropertiesF.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice
+    "$(slicedir)\IceBox\IceBox.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/CommunicatorF.ice" \
+    "$(slicedir)/Ice/PropertiesF.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice"
 
 IceGrid_Admin_ice.py: \
-    $(slicedir)\IceGrid\Admin.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Exception.ice \
-    $(slicedir)/IceGrid/Descriptor.ice
+    "$(slicedir)\IceGrid\Admin.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Exception.ice" \
+    "$(slicedir)/IceGrid/Descriptor.ice"
 
 IceGrid_Descriptor_ice.py: \
-    $(slicedir)\IceGrid\Descriptor.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IceGrid\Descriptor.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceGrid_Exception_ice.py: \
-    $(slicedir)\IceGrid\Exception.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IceGrid\Exception.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceGrid_FileParser_ice.py: \
-    $(slicedir)\IceGrid\FileParser.ice \
-    $(slicedir)/IceGrid/Admin.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Exception.ice \
-    $(slicedir)/IceGrid/Descriptor.ice
+    "$(slicedir)\IceGrid\FileParser.ice" \
+    "$(slicedir)/IceGrid/Admin.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Exception.ice" \
+    "$(slicedir)/IceGrid/Descriptor.ice"
 
 IceGrid_Locator_ice.py: \
-    $(slicedir)\IceGrid\Locator.ice \
-    $(slicedir)/Ice/Locator.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/ProcessF.ice
+    "$(slicedir)\IceGrid\Locator.ice" \
+    "$(slicedir)/Ice/Locator.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/ProcessF.ice"
 
 IceGrid_Observer_ice.py: \
-    $(slicedir)\IceGrid\Observer.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Exception.ice \
-    $(slicedir)/IceGrid/Descriptor.ice \
-    $(slicedir)/IceGrid/Admin.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice
+    "$(slicedir)\IceGrid\Observer.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Exception.ice" \
+    "$(slicedir)/IceGrid/Descriptor.ice" \
+    "$(slicedir)/IceGrid/Admin.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice"
 
 IceGrid_Query_ice.py: \
-    $(slicedir)\IceGrid\Query.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/IceGrid/Exception.ice
+    "$(slicedir)\IceGrid\Query.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/IceGrid/Exception.ice"
 
 IceGrid_Registry_ice.py: \
-    $(slicedir)\IceGrid\Registry.ice \
-    $(slicedir)/IceGrid/Exception.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/IceGrid/Session.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Admin.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice \
-    $(slicedir)/IceGrid/Descriptor.ice
+    "$(slicedir)\IceGrid\Registry.ice" \
+    "$(slicedir)/IceGrid/Exception.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/IceGrid/Session.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Admin.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice" \
+    "$(slicedir)/IceGrid/Descriptor.ice"
 
 IceGrid_Session_ice.py: \
-    $(slicedir)\IceGrid\Session.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Exception.ice
+    "$(slicedir)\IceGrid\Session.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Exception.ice"
 
 IceGrid_UserAccountMapper_ice.py: \
-    $(slicedir)\IceGrid\UserAccountMapper.ice
+    "$(slicedir)\IceGrid\UserAccountMapper.ice"
 
 IcePatch2_FileInfo_ice.py: \
-    $(slicedir)\IcePatch2\FileInfo.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IcePatch2\FileInfo.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IcePatch2_FileServer_ice.py: \
-    $(slicedir)\IcePatch2\FileServer.ice \
-    $(slicedir)/IcePatch2/FileInfo.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IcePatch2\FileServer.ice" \
+    "$(slicedir)/IcePatch2/FileInfo.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceStorm_Metrics_ice.py: \
-    $(slicedir)\IceStorm\Metrics.ice \
-    $(slicedir)/Ice/Metrics.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IceStorm\Metrics.ice" \
+    "$(slicedir)/Ice/Metrics.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceStorm_IceStorm_ice.py: \
-    $(slicedir)\IceStorm\IceStorm.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice \
-    $(slicedir)/IceStorm/Metrics.ice \
-    $(slicedir)/Ice/Metrics.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IceStorm\IceStorm.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice" \
+    "$(slicedir)/IceStorm/Metrics.ice" \
+    "$(slicedir)/Ice/Metrics.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
diff --git a/py/python/Ice.py b/py/python/Ice.py
index ef8c253d829..b8c9f0a8721 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -501,6 +501,39 @@ define the start and stop methods.'''
 to terminate.'''
         pass
 
+class BatchRequest(object):
+    '''Base class for batch request interceptor. A subclass must
+define the enqueue method.'''
+    def __init__(self, size, operation, proxy):
+        self._size = size
+        self._operation = operation
+        self._proxy = proxy
+
+    def getSize():
+        return self._size
+
+    def getOperation():
+        return self._operation
+
+    def getProxy():
+        return self._proxy
+
+    def enqueue():
+        '''Call enqueue from the batch request interceptor enqueue
+implementation to confirm the batching a this request.'''
+        pass
+
+class BatchRequestInterceptor(object):
+    '''Base class for batch request interceptor. A subclass must
+define the enqueue method.'''
+
+    def __init__(self):
+        pass
+
+    def enqueue(request, queueCount, queueSize):
+        '''Invoked when a request is batched.'''
+        pass
+
 #
 # Initialization data.
 #
@@ -518,8 +551,8 @@ threadHook: An object that implements ThreadNotification.
     def __init__(self):
         self.properties = None
         self.logger = None
-        #self.stats = None # Stats not currently supported in Python.
         self.threadHook = None
+        self.batchRequestInterceptor = None
 
 #
 # Communicator wrapper.
@@ -630,7 +663,7 @@ class CommunicatorI(Communicator):
 
     def createAdmin(self, adminAdapter, adminIdentity):
         return self._impl.createAdmin(adminAdapter, adminIdentity)
-    
+
     def getAdmin(self):
         return self._impl.getAdmin()
 
@@ -780,7 +813,7 @@ class ObjectAdapterI(ObjectAdapter):
 
     def getLocator(self):
         return self._impl.getLocator()
-    
+
     def refreshPublishedEndpoints(self):
         self._impl.refreshPublishedEndpoints()
 
@@ -931,7 +964,7 @@ class ImplicitContextI(ImplicitContext):
     def remove(self, key):
         return self._impl.remove(key)
 
-    
+
 #
 # Its not possible to block in a python signal handler since this
 # blocks the main thread from doing further work. As such we queue the
@@ -1151,10 +1184,10 @@ value is an integer representing the exit status.
         #
         # Set _ctrlCHandler to 0 only once communicator.destroy() has
         # completed.
-        # 
+        #
         Application._ctrlCHandler.destroy()
         Application._ctrlCHandler = None
-        
+
         return status
 
     def doMain(self, args, initData):
@@ -1166,7 +1199,7 @@ value is an integer representing the exit status.
         except:
             getProcessLogger().error(traceback.format_exc())
             status = 1
-        
+
         #
         # Don't want any new interrupt and at this point (post-run),
         # it would not make sense to release a held signal to run
@@ -1196,7 +1229,7 @@ value is an integer representing the exit status.
             except:
                 getProcessLogger().error(traceback.format_exc())
                 status = 1
-            Application._communicator = None        
+            Application._communicator = None
         return status
 
     def run(self, args):
diff --git a/py/test/Ice/ami/AllTests.py b/py/test/Ice/ami/AllTests.py
index 0227614446f..93d7d9573ba 100644
--- a/py/test/Ice/ami/AllTests.py
+++ b/py/test/Ice/ami/AllTests.py
@@ -694,12 +694,12 @@ def allTests(communicator, collocated):
         b1 = p.ice_batchOneway()
         b1.opBatch()
         b1.ice_getConnection().close(False)
-        cb = FlushExCallback()
+        cb = FlushCallback()
         r = b1.begin_ice_flushBatchRequests(cb.exception, cb.sent)
         cb.check()
-        test(not r.isSent())
+        test(r.isSent())
         test(r.isCompleted())
-        test(p.opBatchCount() == 0)
+        test(p.waitForBatch(1))
 
         #
         # Exception with cookie.
@@ -708,10 +708,10 @@ def allTests(communicator, collocated):
         b1 = p.ice_batchOneway()
         b1.opBatch()
         b1.ice_getConnection().close(False)
-        cb = FlushExCallback(cookie)
+        cb = FlushCallback(cookie)
         r = b1.begin_ice_flushBatchRequests(lambda ex: cb.exceptionWC(ex, cookie), lambda ss: cb.sentWC(ss, cookie))
         cb.check()
-        test(p.opBatchCount() == 0)
+        test(p.waitForBatch(1))
 
     print("ok")
 
@@ -725,7 +725,7 @@ def allTests(communicator, collocated):
         # Without cookie.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
         b1.opBatch()
         b1.opBatch()
         cb = FlushCallback()
@@ -739,7 +739,7 @@ def allTests(communicator, collocated):
         # With cookie.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
         b1.opBatch()
         b1.opBatch()
         cb = FlushCallback(cookie)
@@ -752,7 +752,7 @@ def allTests(communicator, collocated):
         # Exception without cookie.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
         b1.opBatch()
         b1.ice_getConnection().close(False)
         cb = FlushExCallback()
@@ -766,7 +766,7 @@ def allTests(communicator, collocated):
         # Exception with cookie.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
         b1.opBatch()
         b1.ice_getConnection().close(False)
         cb = FlushExCallback(cookie)
@@ -784,7 +784,7 @@ def allTests(communicator, collocated):
         # 1 connection.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
         b1.opBatch()
         b1.opBatch()
         cb = FlushCallback()
@@ -798,7 +798,7 @@ def allTests(communicator, collocated):
         # 1 connection.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
         b1.opBatch()
         b1.ice_getConnection().close(False)
         cb = FlushCallback()
@@ -812,8 +812,9 @@ def allTests(communicator, collocated):
         # 2 connections.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
-        b2 = p.ice_connectionId("2").ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
+        b2 = Test.TestIntfPrx.uncheckedCast(p.ice_connectionId("2").ice_getConnection().createProxy(
+            p.ice_getIdentity()).ice_batchOneway())
         b2.ice_getConnection() # Ensure connection is established.
         b1.opBatch()
         b1.opBatch()
@@ -833,8 +834,9 @@ def allTests(communicator, collocated):
         # Exceptions should not be reported.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
-        b2 = p.ice_connectionId("2").ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
+        b2 = Test.TestIntfPrx.uncheckedCast(p.ice_connectionId("2").ice_getConnection().createProxy(
+            p.ice_getIdentity()).ice_batchOneway())
         b2.ice_getConnection() # Ensure connection is established.
         b1.opBatch()
         b2.opBatch()
@@ -852,8 +854,9 @@ def allTests(communicator, collocated):
         # The sent callback should be invoked even if all connections fail.
         #
         test(p.opBatchCount() == 0)
-        b1 = p.ice_batchOneway()
-        b2 = p.ice_connectionId("2").ice_batchOneway()
+        b1 = Test.TestIntfPrx.uncheckedCast(p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway())
+        b2 = Test.TestIntfPrx.uncheckedCast(p.ice_connectionId("2").ice_getConnection().createProxy(
+            p.ice_getIdentity()).ice_batchOneway())
         b2.ice_getConnection() # Ensure connection is established.
         b1.opBatch()
         b2.opBatch()
@@ -978,7 +981,7 @@ def allTests(communicator, collocated):
     test(r.getCommunicator() == communicator)
     test(r.getProxy() == None) # Expected
     communicator.end_flushBatchRequests(r)
-    
+
     if(p.ice_getConnection()):
         r1 = None;
         r2 = None;
@@ -988,15 +991,15 @@ def allTests(communicator, collocated):
             seq = ''.join(b)
         else:
             b = [random.randint(0, 255) for x in range(0, 10024)]
-            seq = bytes(b) 
-            
+            seq = bytes(b)
+
         testController.holdAdapter()
 
         for x in range(0, 200): # 2MB
             r = p.begin_opWithPayload(seq)
-        
+
         test(not r.isSent())
-        
+
         r1 = p.begin_ice_ping()
         r2 = p.begin_ice_id()
         r1.cancel()
@@ -1012,7 +1015,7 @@ def allTests(communicator, collocated):
             test(false)
         except(Ice.InvocationCanceledException):
             pass
-        
+
         testController.resumeAdapter()
         p.ice_ping()
         test(not r1.isSent() and r1.isCompleted())
diff --git a/py/test/Ice/operations/BatchOneways.py b/py/test/Ice/operations/BatchOneways.py
index 840acde01c1..0e73c6f1a2d 100644
--- a/py/test/Ice/operations/BatchOneways.py
+++ b/py/test/Ice/operations/BatchOneways.py
@@ -13,6 +13,39 @@ def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
+class BatchRequestInterceptorI(Ice.BatchRequestInterceptor):
+
+    def __init__(self):
+        self._enabled = False
+        self._count = 0
+        self._size = 0
+        self._lastRequestSize = 0
+
+    def enqueue(self, request, count, size):
+        test(request.getOperation() == "opByteSOneway" or request.getOperation() == "ice_ping")
+        test(request.getProxy().ice_isBatchOneway())
+
+        if count > 0:
+            test(self._lastRequestSize + self._size == size)
+
+        self._count = count
+        self._size = size
+
+        if self._size + request.getSize() > 25000:
+            request.getProxy().begin_ice_flushBatchRequests()
+            self._size = 18 # header
+
+        if self._enabled:
+            self._lastRequestSize = request.getSize()
+            self._count += 1
+            request.enqueue()
+
+    def setEnabled(self, v):
+        self._enabled = v
+
+    def count(self):
+        return self._count
+
 def batchOneways(p):
 
     if sys.version_info[0] == 2:
@@ -20,27 +53,18 @@ def batchOneways(p):
         bs1[0:10 * 1024] = range(0, 10 * 1024) # add 100,000 entries.
         bs1 = ['\x00' for x in bs1] # set them all to \x00
         bs1 = ''.join(bs1) # make into a byte array
-
-        bs2 = []
-        bs2[0:99 * 1024] = range(0, 99 * 1024) # add 100,000 entries.
-        bs2 = ['\x00' for x in bs2] # set them all to \x00
-        bs2 = ''.join(bs2) # make into a byte array
     else:
         bs1 = bytes([0 for x in range(0, 10 * 1024)])
-        bs2 = bytes([0 for x in range(0, 99 * 1024)])
 
     try:
         p.opByteSOneway(bs1)
     except Ice.MemoryLimitException:
         test(False)
 
-    try:
-        p.opByteSOneway(bs2)
-    except Ice.MemoryLimitException:
-        test(False)
-
     batch = Test.MyClassPrx.uncheckedCast(p.ice_batchOneway())
 
+    batch.ice_flushBatchRequests() # Empty flush
+
     p.opByteSOnewayCallCount() # Reset the call count
 
     for i in range(30):
@@ -52,35 +76,23 @@ def batchOneways(p):
         time.sleep(0.01)
 
     if p.ice_getConnection():
-        batch.ice_getConnection().flushBatchRequests()
-
+        batch1 = Test.MyClassPrx.uncheckedCast(p.ice_batchOneway())
         batch2 = Test.MyClassPrx.uncheckedCast(p.ice_batchOneway())
 
-        batch.ice_ping()
+        batch1.ice_ping()
         batch2.ice_ping()
-        batch.ice_flushBatchRequests()
-        batch.ice_getConnection().close(False)
-        batch.ice_ping()
+        batch1.ice_flushBatchRequests()
+        batch1.ice_getConnection().close(False)
+        batch1.ice_ping()
         batch2.ice_ping()
-        
-        batch.ice_getConnection()
+
+        batch1.ice_getConnection()
         batch2.ice_getConnection()
-        
-        batch.ice_ping()
-        batch.ice_getConnection().close(False)
-        try:
-            batch.ice_ping()
-            test(False)
-        except Ice.CloseConnectionException:
-            pass
-
-        try:
-            batch2.ice_ping()
-            test(False)
-        except Ice.CloseConnectionException:
-            pass
 
-        batch.ice_ping()
+        batch1.ice_ping()
+        batch1.ice_getConnection().close(False)
+
+        batch1.ice_ping()
         batch2.ice_ping()
 
     identity = Ice.Identity()
@@ -88,9 +100,46 @@ def batchOneways(p):
     batch3 = batch.ice_identity(identity)
     batch3.ice_ping()
     batch3.ice_flushBatchRequests()
-    
+
     # Make sure that a bogus batch request doesn't cause troubles to other ones.
     batch3.ice_ping()
     batch.ice_ping()
     batch.ice_flushBatchRequests()
     batch.ice_ping()
+
+    if batch.ice_getConnection():
+        initData = Ice.InitializationData()
+        initData.properties = p.ice_getCommunicator().getProperties().clone()
+        interceptor = BatchRequestInterceptorI()
+        initData.batchRequestInterceptor = interceptor
+
+        ic = Ice.initialize(data=initData)
+
+        batch = Test.MyClassPrx.uncheckedCast(ic.stringToProxy(p.ice_toString())).ice_batchOneway()
+
+        test(interceptor.count() == 0)
+        batch.ice_ping()
+        batch.ice_ping()
+        batch.ice_ping()
+        test(interceptor.count() == 0)
+
+        interceptor.setEnabled(True)
+        batch.ice_ping()
+        batch.ice_ping()
+        batch.ice_ping()
+        test(interceptor.count() == 3)
+
+        batch.ice_flushBatchRequests()
+        batch.ice_ping()
+        test(interceptor.count() == 1)
+
+        batch.opByteSOneway(bs1)
+        test(interceptor.count() == 2)
+        batch.opByteSOneway(bs1)
+        test(interceptor.count() == 3)
+
+        batch.opByteSOneway(bs1) # This should trigger the flush
+        batch.ice_ping()
+        test(interceptor.count() == 2)
+
+        ic.destroy()
diff --git a/py/test/Ice/operations/BatchOnewaysAMI.py b/py/test/Ice/operations/BatchOnewaysAMI.py
index 13a5b2dc6fa..f78bf40db04 100644
--- a/py/test/Ice/operations/BatchOnewaysAMI.py
+++ b/py/test/Ice/operations/BatchOnewaysAMI.py
@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 
-import Ice, Test, array, sys, threading
+import Ice, Test, array, sys, threading, time
 
 def test(b):
     if not b:
@@ -40,60 +40,49 @@ def batchOneways(p):
         bs1[0:10 * 1024] = range(0, 10 * 1024) # add 100,000 entries.
         bs1 = ['\x00' for x in bs1] # set them all to \x00
         bs1 = ''.join(bs1) # make into a byte array
-
-        bs2 = []
-        bs2[0:99 * 1024] = range(0, 99 * 1024) # add 100,000 entries.
-        bs2 = ['\x00' for x in bs2] # set them all to \x00
-        bs2 = ''.join(bs2) # make into a byte array
     else:
         bs1 = bytes([0 for x in range(0, 10 * 1024)])
-        bs2 = bytes([0 for x in range(0, 99 * 1024)])
-
-    cb = Callback()
-    p.begin_opByteSOneway(bs1, lambda: cb.called(), lambda ex: test(False) )
-    cb.check()
-    p.begin_opByteSOneway(bs2, lambda: cb.called(), lambda ex: test(False) )
-    cb.check()
-
     batch = Test.MyClassPrx.uncheckedCast(p.ice_batchOneway())
 
+    batch.end_ice_flushBatchRequests(batch.begin_ice_flushBatchRequests()) # Empty flush
+    test(batch.begin_ice_flushBatchRequests().isSent()) # Empty flush
+    test(batch.begin_ice_flushBatchRequests().isCompleted()) # Empty flush
+    test(batch.begin_ice_flushBatchRequests().sentSynchronously()) # Empty flush
+
     for i in range(30):
         batch.begin_opByteSOneway(bs1, lambda: 0, lambda ex: test(False) )
 
+    count = 0
+    while count < 27: # 3 * 9 requests auto-flushed.
+        count += p.opByteSOnewayCallCount()
+        time.sleep(0.01)
+
     if p.ice_getConnection():
-        batch.ice_getConnection().end_flushBatchRequests(batch.ice_getConnection().begin_flushBatchRequests())
 
+        batch1 = Test.MyClassPrx.uncheckedCast(p.ice_batchOneway())
         batch2 = Test.MyClassPrx.uncheckedCast(p.ice_batchOneway())
 
-        batch.begin_ice_ping()
-        batch2.begin_ice_ping()
-        batch.end_ice_flushBatchRequests(batch.begin_ice_flushBatchRequests())
-        batch.ice_getConnection().close(False)
-        batch.begin_ice_ping()
-        batch2.begin_ice_ping()
-        
-        batch.ice_getConnection()
-        batch2.ice_getConnection()
-        
-        batch.begin_ice_ping()
-        batch.ice_getConnection().close(False)
+        batch1.end_ice_ping(batch1.begin_ice_ping())
+        batch2.end_ice_ping(batch2.begin_ice_ping())
+        batch1.end_ice_flushBatchRequests(batch1.begin_ice_flushBatchRequests())
+        batch1.ice_getConnection().close(False)
+        batch1.end_ice_ping(batch1.begin_ice_ping())
+        batch2.end_ice_ping(batch2.begin_ice_ping())
 
-        def checkCloseConnection(ex):
-            test(isinstance(ex, Ice.CloseConnectionException))
-            cb.called()
+        batch1.ice_getConnection()
+        batch2.ice_getConnection()
 
-        batch.begin_ice_ping(lambda: test(False), lambda ex: checkCloseConnection(ex) )
-        batch2.begin_ice_ping(lambda: test(False), lambda ex: checkCloseConnection(ex) )
+        batch1.ice_getConnection().close(False)
 
-        batch.begin_ice_ping()
-        batch2.begin_ice_ping()
+        batch1.end_ice_ping(batch1.begin_ice_ping())
+        batch2.end_ice_ping(batch2.begin_ice_ping())
 
     identity = Ice.Identity()
     identity.name = "invalid";
     batch3 = batch.ice_identity(identity)
     batch3.ice_ping()
     batch3.end_ice_flushBatchRequests(batch3.begin_ice_flushBatchRequests())
-    
+
     # Make sure that a bogus batch request doesn't cause troubles to other ones.
     batch3.ice_ping()
     batch.ice_ping()
author	Benoit Foucher <benoit@zeroc.com>	2015-03-10 12:12:10 +0100
committer	Benoit Foucher <benoit@zeroc.com>	2015-03-10 12:12:10 +0100
commit	c6ca68d97aa5bbc2a172e3e35171b5452657fa22 (patch)
tree	46edcca4c8e313285a205bf6fad7c56c452c0cc0 /py
parent	Minor JS style fixes (diff)
download	ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.bz2 ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.xz ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.zip