Initial commit of generic marshaling.

1 files changed, 16 insertions, 31 deletions

diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 9d2bc9bf314..9f80344fe1d 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -816,8 +816,8 @@ IceInternal::BasicStream::write(const ObjectPtr& v)
     }
 }
 
-bool
-IceInternal::BasicStream::read(const string& signatureType, ObjectPtr& v)
+void
+IceInternal::BasicStream::read(const string& signatureType, const ObjectFactoryPtr& factory, ObjectPtr& v)
 {
     if (!_currentReadEncaps) // Lazy initialization
     {
@@ -835,7 +835,6 @@ IceInternal::BasicStream::read(const string& signatureType, ObjectPtr& v)
 	    throw IllegalIndirectionException(__FILE__, __LINE__);
 	}
 	v = _currentReadEncaps->objectsRead[pos];
-	return true;
     }
     else
     {
@@ -846,52 +845,38 @@ IceInternal::BasicStream::read(const string& signatureType, ObjectPtr& v)
 	if (id.empty())
 	{
 	    v = 0;
-	    return true;
+	    return;
 	}
 	else if (id == iceObject)
 	{
 	    v = new ::Ice::Object;
-	    read(v);
-	    return true;
 	}
 	else
 	{
-	    ObjectFactoryPtr factory = _instance->servantFactoryManager()->find(id);
-	    
-	    if (factory)
+	    ObjectFactoryPtr userFactory = _instance->servantFactoryManager()->find(id);
+	    if (userFactory)
+	    {
+		v = userFactory->create(id);
+	    }
+
+	    if (!v && id == signatureType)
 	    {
+		assert(factory);
 		v = factory->create(id);
-		if (v)
-		{
-		    read(v);
-		    return true;
-		}
+		assert(v);
 	    }
 	    
-	    if (id == signatureType)
+	    if (!v)
 	    {
-		return false;
+		throw NoObjectFactoryException(__FILE__, __LINE__);
 	    }
-	    
-	    throw NoObjectFactoryException(__FILE__, __LINE__);
 	}
+	_currentReadEncaps->objectsRead.push_back(v.get());
+	v->__read(this);
     }
 }
 
 void
-IceInternal::BasicStream::read(const ObjectPtr& v)
-{
-    assert(v);
-    if (!_currentReadEncaps) // Lazy initialization
-    {
-	_readEncapsStack.resize(1);
-	_currentReadEncaps = &_readEncapsStack.back();
-    }
-    _currentReadEncaps->objectsRead.push_back(v.get());
-    v->__read(this);
-}
-
-void
 IceInternal::BasicStream::write(const UserException& v)
 {
     write(v.__getExceptionIds()[0]);