encaps fixes

13 files changed, 75 insertions, 46 deletions

diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 26d294e8d95..32f5a3b9e6b 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -52,6 +52,7 @@ public:
     void endWriteEncaps();
     void startReadEncaps();
     void endReadEncaps();
+    void skipReadEncaps(); 
     void checkReadEncaps();
     Ice::Int getReadEncapsSize();
     void skipEncaps();
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index 19b19c6f5ab..31e465d9cb7 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -32,7 +32,7 @@ protected:
     IncomingBase(Instance*, Connection*, const Ice::ObjectAdapterPtr&, bool);
     IncomingBase(IncomingBase& in); // Adopts the argument. It must not be used afterwards.
     
-    void __finishInvoke();
+    void __finishInvoke(bool);
     void __warning(const Ice::Exception&) const;
     void __warning(const std::string&) const;
 
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 305a43d33a5..d564ab96994 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -141,6 +141,21 @@ IceInternal::BasicStream::startReadEncaps()
 void
 IceInternal::BasicStream::endReadEncaps()
 {
+    checkReadEncaps();
+    _readEncapsStack.pop_back();
+    if(_readEncapsStack.empty())
+    {
+	_currentReadEncaps = 0;
+    }
+    else
+    {
+	_currentReadEncaps = &_readEncapsStack.back();
+    }
+}
+
+void
+IceInternal::BasicStream::skipReadEncaps()
+{
     assert(_currentReadEncaps);
     int start = _currentReadEncaps->start;
     _readEncapsStack.pop_back();
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 575901c0a94..37f23a5a9a7 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -56,14 +56,21 @@ IceInternal::IncomingBase::IncomingBase(IncomingBase& in) :
 }
 
 void
-IceInternal::IncomingBase::__finishInvoke()
+IceInternal::IncomingBase::__finishInvoke(bool success)
 {
     if(_locator && _servant)
     {
 	_locator->finished(_current, _servant, _cookie);
     }
 
-    _is.endReadEncaps();
+    if(success)
+    {
+	_is.endReadEncaps();
+    }
+    else
+    {
+	_is.skipReadEncaps();
+    }
 
     //
     // Send a response if necessary. If we don't need to send a
@@ -265,7 +272,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	    _os.write(ex.operation);
 	}
 
-	__finishInvoke();
+	__finishInvoke(false);
 	return;
     }
     catch(const LocalException& ex)
@@ -282,7 +289,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	    _os.write(str.str());
 	}
 
-	__finishInvoke();
+	__finishInvoke(false);
 	return;
     }
     catch(const UserException& ex)
@@ -299,7 +306,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	    _os.write(str.str());
 	}
 
-	__finishInvoke();
+	__finishInvoke(false);
 	return;
     }
     catch(const Exception& ex)
@@ -316,7 +323,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	    _os.write(str.str());
 	}
 
-	__finishInvoke();
+	__finishInvoke(false);
 	return;
     }
     catch(const std::exception& ex)
@@ -333,7 +340,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	    _os.write(str.str());
 	}
 
-	__finishInvoke();
+	__finishInvoke(false);
 	return;
     }
     catch(...)
@@ -349,7 +356,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	    _os.write(reason);
 	}
 
-	__finishInvoke();
+	__finishInvoke(false);
 	return;
     }
 
@@ -382,5 +389,5 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
 	}
     }
 
-    __finishInvoke();
+    __finishInvoke(status == DispatchOK || status == DispatchUserException);
 }
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index c0499e93fe0..b9d34f7aa1e 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -53,7 +53,7 @@ IceInternal::IncomingAsync::__response(bool ok)
 	}
     }
 
-    __finishInvoke();
+    __finishInvoke(true);
 }
 
 void
@@ -150,7 +150,7 @@ IceInternal::IncomingAsync::__exception(const Exception& exc)
 	}
     }
 
-    __finishInvoke();
+    __finishInvoke(false);
 }
 
 void
@@ -166,7 +166,7 @@ IceInternal::IncomingAsync::__exception(const std::exception& ex)
 	_os.write(str.str());
     }
 
-    __finishInvoke();
+    __finishInvoke(false);
 }
 
 void
@@ -181,7 +181,7 @@ IceInternal::IncomingAsync::__exception()
 	_os.write(reason);
     }
 
-    __finishInvoke();
+    __finishInvoke(false);
 }
 
 IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) :
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 6b6dde0fc4d..e886bc28627 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -200,29 +200,6 @@ IceInternal::Outgoing::invoke()
     return true;
 }
 
-/*
-void
-IceInternal::Outgoing::invokeAsync(const IceAMI::Ice::ObjectPtr& asyncCB)
-{
-    _asyncCB = asyncCB;
-    _os.endWriteEncaps();
-    
-    //
-    // We cannot set _state to StateInProgress after sendRequest(),
-    // because there would be a race with finished().
-    //
-    _state = StateInProgress;
-
-    //
-    // For asynchronous invocations, we always use twoway, regardless
-    // of what the reference says. There is no point in asynchronous
-    // oneways or datagrams, because there is no reply from the
-    // server.
-    //
-    _connection->sendRequest(this, false, _reference->compress);
-}
-*/
-
 void
 IceInternal::Outgoing::finished(BasicStream& is)
 {
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 33d6a544b98..bb81b58f445 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -79,7 +79,10 @@ IceInternal::OutgoingAsync::__setup(const ConnectionPtr& connection, const Refer
 void
 IceInternal::OutgoingAsync::__invoke()
 {
+    _os->endWriteEncaps();
+
     _connection->sendAsyncRequest(this);
+
     if(_connection->timeout() >= 0)
     {
 	_absoluteTimeout = IceUtil::Time::now() + IceUtil::Time::milliSeconds(_connection->timeout());
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index b98d65f95dd..e954f900e66 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -1125,7 +1125,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     try
     {
 	ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_newIdentity(id));
-	thrower2->ice_ping();
+	thrower2->throwAasA(1);
+//	thrower2->ice_ping();
 	test(false);
     }
     catch(const Ice::ObjectNotExistException& ex)
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 20a4ea56bbe..50b96d75c22 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -244,6 +244,21 @@ public class BasicStream
     public void
     endReadEncaps()
     {
+	checkReadEncaps();
+        final ReadEncaps curr = _readEncapsStack;
+        assert(curr != null);
+        _readEncapsStack = curr.next;
+        curr.next = _readEncapsCache;
+        _readEncapsCache = curr;
+        if(_readEncapsCache.objectsRead != null)
+        {
+            _readEncapsCache.objectsRead.clear();
+        }
+    }
+
+    public void
+    skipReadEncaps()
+    {
         final ReadEncaps curr = _readEncapsStack;
         assert(curr != null);
         final int start = curr.start;
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index cd3f0a2ba0e..c3b618368b1 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -205,7 +205,7 @@ final public class Incoming extends IncomingBase
 		_os.writeString(ex.operation);
             }
 
-	    __finishInvoke();
+	    __finishInvoke(false);
 	    return;
         }
         catch(Ice.LocalException ex)
@@ -220,7 +220,7 @@ final public class Incoming extends IncomingBase
 		_os.writeString(ex.toString());
             }
 
-	    __finishInvoke();
+	    __finishInvoke(false);
 	    return;
         }
         /* Not possible in Java - UserExceptions are checked exceptions
@@ -241,7 +241,7 @@ final public class Incoming extends IncomingBase
 		_os.writeString(ex.toString());
             }
 	    
-	    __finishInvoke();
+	    __finishInvoke(false);
 	    return;
         }
 	
@@ -277,7 +277,7 @@ final public class Incoming extends IncomingBase
 	    }
 	}
 
-	__finishInvoke();
+	__finishInvoke(status == DispatchStatus.DispatchOK || status == DispatchStatus.DispatchUserException);
     }
 
     public BasicStream
diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/IceInternal/IncomingAsync.java
index 6fceb838899..7c91d2d3187 100644
--- a/java/src/IceInternal/IncomingAsync.java
+++ b/java/src/IceInternal/IncomingAsync.java
@@ -58,7 +58,7 @@ public class IncomingAsync extends IncomingBase
 	    _os.pos(save);
 	}
 	
-	__finishInvoke();
+	__finishInvoke(true);
     }
 
     final protected void
@@ -149,7 +149,7 @@ public class IncomingAsync extends IncomingBase
             }
 	}
 
-	__finishInvoke();
+	__finishInvoke(false);
     }
 
     final protected BasicStream
diff --git a/java/src/IceInternal/IncomingBase.java b/java/src/IceInternal/IncomingBase.java
index d90363c92a9..b5f37ffcbcf 100644
--- a/java/src/IceInternal/IncomingBase.java
+++ b/java/src/IceInternal/IncomingBase.java
@@ -63,14 +63,21 @@ public class IncomingBase
     }
 
     final protected void
-    __finishInvoke()
+    __finishInvoke(boolean success)
     {
 	if(_locator != null && _servant != null)
 	{
 	    _locator.finished(_current, _servant, _cookie.value);
 	}
 	
-	_is.endReadEncaps();
+	if(success)
+	{
+	    _is.endReadEncaps();
+	}
+	else
+	{
+	    _is.skipReadEncaps();
+	}
 	
 	//
 	// Send a response if necessary. If we don't need to send a
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index d99e6b80fb1..93a5691a4c8 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -93,7 +93,10 @@ public abstract class OutgoingAsync
     {
 	try
 	{
+	    _os.endWriteEncaps();
+
 	    _connection.sendAsyncRequest(this);
+
 	    if(_connection.timeout() >= 0)
 	    {
 		_absoluteTimeoutMillis = System.currentTimeMillis() + _connection.timeout() * 1000;