diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-07-10 16:51:36 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-07-10 16:51:36 -0400 |
| commit | 7f767642e79e2775a958781011f13e3d1710c7bd (patch) | |
| tree | fdb3eb1f826305d0bf3dd659d70c3930001f80c0 /cpp/src/Ice/ObjectAdapterI.h | |
| parent | ICE-5573 - .NET TimeoutException ignores Dispatcher (diff) | |
| download | ice-7f767642e79e2775a958781011f13e3d1710c7bd.tar.bz2 ice-7f767642e79e2775a958781011f13e3d1710c7bd.tar.xz ice-7f767642e79e2775a958781011f13e3d1710c7bd.zip | |
Fixed ICE-5379, Object Adapter should reject null servant, in C++, Java, C# and JS
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 55946b580ef..52a3865c714 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -111,7 +111,6 @@ private: ObjectPrx newDirectProxy(const Identity&, const std::string&) const; ObjectPrx newIndirectProxy(const Identity&, const std::string&, const std::string&) const; void checkForDeactivation() const; - static void checkIdentity(const Identity&); std::vector<IceInternal::EndpointIPtr> parseEndpoints(const std::string&, bool) const; std::vector<IceInternal::EndpointIPtr> parsePublishedEndpoints(); void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrx&, bool); |