diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-09-24 16:00:56 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-09-24 16:00:56 -0700 |
| commit | 6bb0a7b82684d1ce59a996848773054ede1f442e (patch) | |
| tree | 9a9cfbaa225afd5caca819eea9558908c9a64a40 /rb/src/IceRuby/ObjectFactory.cpp | |
| parent | Replaced optionalType in StreamTrait<> by a bool fixedLength member (diff) | |
| download | ice-6bb0a7b82684d1ce59a996848773054ede1f442e.tar.bz2 ice-6bb0a7b82684d1ce59a996848773054ede1f442e.tar.xz ice-6bb0a7b82684d1ce59a996848773054ede1f442e.zip | |
Ruby port; Python & C++ fixes
Diffstat (limited to 'rb/src/IceRuby/ObjectFactory.cpp')
| -rw-r--r-- | rb/src/IceRuby/ObjectFactory.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/rb/src/IceRuby/ObjectFactory.cpp b/rb/src/IceRuby/ObjectFactory.cpp index 7e46d958785..499f6f9ac9c 100644 --- a/rb/src/IceRuby/ObjectFactory.cpp +++ b/rb/src/IceRuby/ObjectFactory.cpp @@ -32,7 +32,20 @@ IceRuby::ObjectFactory::create(const string& id) // // Get the type information. // - ClassInfoPtr info = lookupClassInfo(id); + ClassInfoPtr info; + if(id == Ice::Object::ice_staticId()) + { + // + // When the ID is that of Ice::Object, it indicates that the stream has not + // found a factory and is providing us an opportunity to preserve the object. + // + info = lookupClassInfo("::Ice::UnknownSlicedObject"); + } + else + { + info = lookupClassInfo(id); + } + if(!info) { return 0; |