diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-05-08 18:14:39 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-05-08 18:14:39 -0700 |
| commit | 7774bb92669779fd165a0510a360fdaecd69f0c3 (patch) | |
| tree | 8ea8bba6cac4128cd3e511ff21534db130ff8e49 /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Fixed ICE-4709, batch requests and UnmarshalOutOfBoundsException (diff) | |
| download | ice-7774bb92669779fd165a0510a360fdaecd69f0c3.tar.bz2 ice-7774bb92669779fd165a0510a360fdaecd69f0c3.tar.xz ice-7774bb92669779fd165a0510a360fdaecd69f0c3.zip | |
* C++ implementation for compact/sliced formats
* C++ implementation for "preserve-slice" metadata
* C++ tests for compact/sliced/preserved types
* Updated stream API
* Python changes for stream API
* Python tests for compact/sliced formats
* Added Ice.Default.SlicedFormat property
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 236011d6da6..30965746384 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -1439,6 +1439,7 @@ Ice::ObjectAdapterI::filterProperties(StringSeq& unknownProps) "AdapterId", "Endpoints", "Locator", + "Locator.EncodingVersion", "Locator.EndpointSelection", "Locator.ConnectionCached", "Locator.PreferSecure", @@ -1448,6 +1449,7 @@ Ice::ObjectAdapterI::filterProperties(StringSeq& unknownProps) "RegisterProcess", "ReplicaGroupId", "Router", + "Router.EncodingVersion", "Router.EndpointSelection", "Router.ConnectionCached", "Router.PreferSecure", @@ -1503,7 +1505,6 @@ Ice::ObjectAdapterI::filterProperties(StringSeq& unknownProps) } } - if(!valid && addUnknown) { unknownProps.push_back(p->first); @@ -1512,4 +1513,3 @@ Ice::ObjectAdapterI::filterProperties(StringSeq& unknownProps) return noProps; } - |