C++ dispatching code fixes

- removed user exception check on the server side (ICE-6980)
- C++11 dipatch interceptor async callback (ICE-7263)
- Fixed slicing/objects test in various mapping (removed Forward.ice)

1 files changed, 3 insertions, 7 deletions

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java
index 7ca1acc5465..13c134ce170 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java
@@ -197,12 +197,6 @@ final public class Incoming implements com.zeroc.Ice.Request
         {
             try
             {
-                //
-                // Skip the input parameters, this is required for reading
-                // the next batch request if dispatching batch requests.
-                //
-                _is.skipEncapsulation();
-
                 if(servantManager != null && servantManager.hasServant(_current.id))
                 {
                     throw new com.zeroc.Ice.FacetNotExistException(_current.id, _current.facet, _current.operation);
@@ -214,6 +208,7 @@ final public class Incoming implements com.zeroc.Ice.Request
             }
             catch(Throwable ex)
             {
+                skipReadParams(); // Required for batch requests
                 handleException(ex, false);
                 return;
             }
@@ -400,9 +395,10 @@ final public class Incoming implements com.zeroc.Ice.Request
         else
         {
             //
-            // Let's rewind _is and clean-up _os
+            // Let's rewind _is and reset _os
             //
             _is.pos(_inParamPos);
+            _os = null;
         }
     }