diff options
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; } - |