Removed default context support

10 files changed, 49 insertions, 128 deletions

diff --git a/cppe/src/IceE/Communicator.cpp b/cppe/src/IceE/Communicator.cpp
index 8860542402e..eddb7af3c21 100755
--- a/cppe/src/IceE/Communicator.cpp
+++ b/cppe/src/IceE/Communicator.cpp
@@ -113,18 +113,6 @@ Ice::Communicator::createObjectAdapterWithRouter(const string& name, const Route
 
 #endif
 
-void
-Ice::Communicator::setDefaultContext(const Context& ctx)
-{
-    _instance->setDefaultContext(ctx);
-}
-
-Ice::Context
-Ice::Communicator::getDefaultContext() const
-{
-    return _instance->getDefaultContext()->getValue();
-}
-
 PropertiesPtr
 Ice::Communicator::getProperties() const
 {
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index 4b11dbd668a..cfda950509c 100755
--- a/cppe/src/IceE/Connection.cpp
+++ b/cppe/src/IceE/Connection.cpp
@@ -955,8 +955,7 @@ Ice::Connection::createProxy(const Identity& ident) const
     //
     vector<ConnectionPtr> connections;
     connections.push_back(const_cast<Connection*>(this));
-    ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), "",
-    							     Reference::ModeTwoway, connections);
+    ReferencePtr ref = _instance->referenceFactory()->create(ident, "", Reference::ModeTwoway, connections);
     return _instance->proxyFactory()->referenceToProxy(ref);
 }
 
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp
index ad9062ec575..0a574d9dd57 100644
--- a/cppe/src/IceE/Instance.cpp
+++ b/cppe/src/IceE/Instance.cpp
@@ -221,33 +221,6 @@ IceInternal::Instance::flushBatchRequests()
 }
 #endif
 
-void
-IceInternal::Instance::setDefaultContext(const Context& ctx)
-{
-    IceUtil::RecMutex::Lock sync(*this);
-    
-    if(_state == StateDestroyed)
-    {
-	throw CommunicatorDestroyedException(__FILE__, __LINE__);
-    }
-
-    _defaultContext = new SharedContext(ctx); 
-}
-
-SharedContextPtr
-IceInternal::Instance::getDefaultContext() const
-{
-    IceUtil::RecMutex::Lock sync(*this);
-    
-    if(_state == StateDestroyed)
-    {
-	throw CommunicatorDestroyedException(__FILE__, __LINE__);
-    }
-
-    return _defaultContext;
-}
-
-
 Identity
 IceInternal::Instance::stringToIdentity(const string& s) const
 {
@@ -325,11 +298,10 @@ IceInternal::Instance::identityToString(const Identity& ident) const
 IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const InitializationData& initData) :
     _state(StateActive),
     _initData(initData),
-    _messageSizeMax(0),
+    _messageSizeMax(0)
 #ifndef ICEE_PURE_BLOCKING_CLIENT
-    _threadPerConnectionStackSize(0),
+    , _threadPerConnectionStackSize(0)
 #endif
-    _defaultContext(new SharedContext(initData.defaultContext))
 {
     try
     {
diff --git a/cppe/src/IceE/Instance.h b/cppe/src/IceE/Instance.h
index 90c6c1c2cbf..7da989f46fa 100644
--- a/cppe/src/IceE/Instance.h
+++ b/cppe/src/IceE/Instance.h
@@ -57,9 +57,6 @@ public:
     void flushBatchRequests();
 #endif
 
-     void setDefaultContext(const ::Ice::Context&);
-    SharedContextPtr getDefaultContext() const;
-
 #ifndef ICEE_PURE_BLOCKING_CLIENT
     size_t threadPerConnectionStackSize() const;
 #endif
@@ -108,7 +105,6 @@ private:
 #ifndef ICEE_PURE_CLIENT
     ObjectAdapterFactoryPtr _objectAdapterFactory;
 #endif
-    SharedContextPtr _defaultContext;
 };
 
 }
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index fc3bc266a57..4934aa4eb99 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -544,8 +544,7 @@ Ice::ObjectAdapter::createReverseProxy(const Identity& ident) const
     // reference.
     //
     vector<EndpointPtr> endpoints;
-    ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), "",
-    							     Reference::ModeTwoway, connections);
+    ReferencePtr ref = _instance->referenceFactory()->create(ident, "", Reference::ModeTwoway, connections);
     return _instance->proxyFactory()->referenceToProxy(ref);
 }
 
@@ -808,11 +807,9 @@ Ice::ObjectAdapter::newDirectProxy(const Identity& ident, const string& facet) c
     // Create a reference and return a proxy for this reference.
     //
 #ifdef ICEE_HAS_ROUTER
-    ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(),
-    							     facet, Reference::ModeTwoway, false, endpoints, 0);
+    ReferencePtr ref = _instance->referenceFactory()->create(ident, facet, Reference::ModeTwoway, false, endpoints, 0);
 #else
-    ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(),
-    							     facet, Reference::ModeTwoway, false, endpoints);
+    ReferencePtr ref = _instance->referenceFactory()->create(ident, facet, Reference::ModeTwoway, false, endpoints);
 #endif
     return _instance->proxyFactory()->referenceToProxy(ref);
 
@@ -826,12 +823,11 @@ Ice::ObjectAdapter::newIndirectProxy(const Identity& ident, const string& facet,
     // Create a reference with the adapter id.
     //
 #ifdef ICEE_HAS_ROUTER
-    ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(),
-    							     facet, Reference::ModeTwoway, false, id, 0, _locatorInfo);
-    
+    ReferencePtr ref =
+        _instance->referenceFactory()->create(ident, facet, Reference::ModeTwoway, false, id, 0, _locatorInfo);
 #else
-    ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(),
-    							     facet, Reference::ModeTwoway, false, id, _locatorInfo);
+    ReferencePtr ref =
+        _instance->referenceFactory()->create(ident, facet, Reference::ModeTwoway, false, id, _locatorInfo);
 #endif
 
     //
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 2ec7bf4d986..5c22de23c8d 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -436,14 +436,6 @@ IceProxy::Ice::Object::ice_context(const Context& newContext) const
     return proxy;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_defaultContext() const
-{
-    ObjectPrx proxy(new ::IceProxy::Ice::Object());
-    proxy->setup(_reference->defaultContext());
-    return proxy;
-}
-
 Identity
 IceProxy::Ice::Object::ice_getIdentity() const
 {
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp
index 7fc96b442e3..3afaa5b486f 100644
--- a/cppe/src/IceE/Reference.cpp
+++ b/cppe/src/IceE/Reference.cpp
@@ -37,14 +37,6 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(IceInternal::Reference* p) { return p; }
 
-ReferencePtr
-IceInternal::Reference::defaultContext() const
-{
-    ReferencePtr r = _instance->referenceFactory()->copy(this);
-    r->_context = _instance->getDefaultContext();
-    return r;
-}
-
 CommunicatorPtr
 IceInternal::Reference::getCommunicator() const
 {
@@ -402,14 +394,14 @@ IceInternal::Reference::operator<(const Reference& r) const
 }
 
 IceInternal::Reference::Reference(const InstancePtr& inst, const CommunicatorPtr& com, const Identity& ident,
-				  const SharedContextPtr& ctx, const string& fs, Mode md, bool sec) :
+				  const string& fs, Mode md, bool sec) :
     _hashInitialized(false),
     _instance(inst),
     _communicator(com),
     _mode(md),
     _secure(sec),
     _identity(ident),
-    _context(ctx),
+    _context(new SharedContext(Ice::Context())),
     _facet(fs),
     _overrideTimeout(false),
     _timeout(-1)
@@ -448,9 +440,8 @@ IceInternal::Reference::applyOverrides(vector<EndpointPtr>& endpts) const
 IceUtil::Shared* IceInternal::upCast(IceInternal::FixedReference* p) { return p; }
 
 IceInternal::FixedReference::FixedReference(const InstancePtr& inst, const CommunicatorPtr& com, const Identity& ident,
-					    const SharedContextPtr& ctx, const string& fs, Mode md,
-					    const vector<ConnectionPtr>& fixedConns) :
-    Reference(inst, com, ident, ctx, fs, md, false),
+					    const string& fs, Mode md, const vector<ConnectionPtr>& fixedConns) :
+    Reference(inst, com, ident, fs, md, false),
     _fixedConnections(fixedConns)
 {
 }
@@ -685,9 +676,9 @@ IceInternal::RoutableReference::operator<(const Reference& r) const
 }
 
 IceInternal::RoutableReference::RoutableReference(const InstancePtr& inst, const CommunicatorPtr& com,
-						  const Identity& ident, const SharedContextPtr& ctx, const string& fs,
+						  const Identity& ident, const string& fs,
 						  Mode md, bool sec, const RouterInfoPtr& rtrInfo) :
-    Reference(inst, com, ident, ctx, fs, md, sec), _routerInfo(rtrInfo)
+    Reference(inst, com, ident, fs, md, sec), _routerInfo(rtrInfo)
 {
 }
 
@@ -702,19 +693,19 @@ IceUtil::Shared* IceInternal::upCast(IceInternal::DirectReference* p) { return p
 
 #ifdef ICEE_HAS_ROUTER
 IceInternal::DirectReference::DirectReference(const InstancePtr& inst, const CommunicatorPtr& com,
-					      const Identity& ident, const SharedContextPtr& ctx, const string& fs, Mode md,
+					      const Identity& ident, const string& fs, Mode md,
 					      bool sec, const vector<EndpointPtr>& endpts,
 					      const RouterInfoPtr& rtrInfo) :
 
-    RoutableReference(inst, com, ident, ctx, fs, md, sec, rtrInfo),
+    RoutableReference(inst, com, ident, fs, md, sec, rtrInfo),
     _endpoints(endpts)
 {
 }
 #else
 IceInternal::DirectReference::DirectReference(const InstancePtr& inst, const CommunicatorPtr& com,
-					      const Identity& ident, const SharedContextPtr& ctx, const string& fs, Mode md,
+					      const Identity& ident, const string& fs, Mode md,
 					      bool sec, const vector<EndpointPtr>& endpts) :
-    Reference(inst, com, ident, ctx, fs, md, sec),
+    Reference(inst, com, ident, fs, md, sec),
     _endpoints(endpts)
 {
 }
@@ -903,20 +894,20 @@ IceUtil::Shared* IceInternal::upCast(IceInternal::IndirectReference* p) { return
 
 #ifdef ICEE_HAS_ROUTER
 IceInternal::IndirectReference::IndirectReference(const InstancePtr& inst, const CommunicatorPtr& com,
-						  const Identity& ident, const SharedContextPtr& ctx, const string& fs,
+						  const Identity& ident, const string& fs,
 						  Mode md, bool sec, const string& adptid,
 						  const RouterInfoPtr& rtrInfo, const LocatorInfoPtr& locInfo) :
-    RoutableReference(inst, com, ident, ctx, fs, md, sec, rtrInfo),
+    RoutableReference(inst, com, ident, fs, md, sec, rtrInfo),
     _adapterId(adptid),
     _locatorInfo(locInfo)
 {
 }
 #else
 IceInternal::IndirectReference::IndirectReference(const InstancePtr& inst, const CommunicatorPtr& com, 
-						  const Identity& ident, const SharedContextPtr& ctx, const string& fs,
+						  const Identity& ident, const string& fs,
 						  Mode md, bool sec, const string& adptid,
 						  const LocatorInfoPtr& locInfo) :
-    Reference(inst, com, ident, ctx, fs, md, sec),
+    Reference(inst, com, ident, fs, md, sec),
     _adapterId(adptid),
     _locatorInfo(locInfo)
 {
diff --git a/cppe/src/IceE/Reference.h b/cppe/src/IceE/Reference.h
index 56de9ee0335..fd8fbf7c3ac 100644
--- a/cppe/src/IceE/Reference.h
+++ b/cppe/src/IceE/Reference.h
@@ -61,8 +61,6 @@ public:
     const InstancePtr& getInstance() const { return _instance; }
     const SharedContextPtr& getContext() const { return _context; }
 
-    ReferencePtr defaultContext() const;
-
     Ice::CommunicatorPtr getCommunicator() const;
 
     virtual Type getType() const = 0;
@@ -116,8 +114,7 @@ public:
 
 protected:
 
-    Reference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const SharedContextPtr&,
-	      const std::string&, Mode, bool);
+    Reference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const std::string&, Mode, bool);
     Reference(const Reference&);
 
     void applyOverrides(std::vector<EndpointPtr>&) const;
@@ -152,7 +149,7 @@ class FixedReference : public Reference
 {
 public:
 
-    FixedReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const SharedContextPtr&,
+    FixedReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&,
 		   const std::string&, Mode, const std::vector<Ice::ConnectionPtr>&);
 
     const std::vector<Ice::ConnectionPtr>& getFixedConnections() const;
@@ -208,7 +205,7 @@ public:
 
 protected:
 
-    RoutableReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const SharedContextPtr&,
+    RoutableReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&,
 		      const std::string&, Mode, bool, const RouterInfoPtr&);
     RoutableReference(const RoutableReference&);
 
@@ -228,7 +225,7 @@ class DirectReference :
 {
 public:
 
-    DirectReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const SharedContextPtr&,
+    DirectReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&,
 		    const std::string&, Mode, bool, const std::vector<EndpointPtr>&
 #ifdef ICEE_HAS_ROUTER
 		    , const RouterInfoPtr&
@@ -280,7 +277,7 @@ class IndirectReference :
 {
 public:
 
-    IndirectReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const SharedContextPtr&,
+    IndirectReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&,
 		      const std::string&, Mode, bool, const std::string&
 #ifdef ICEE_HAS_ROUTER
 		      , const RouterInfoPtr&
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp
index cadc362c16b..6228974ee66 100644
--- a/cppe/src/IceE/ReferenceFactory.cpp
+++ b/cppe/src/IceE/ReferenceFactory.cpp
@@ -52,7 +52,6 @@ IceInternal::ReferenceFactory::copy(const Reference* r) const
 
 ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident,
-				      const SharedContextPtr& context,
 				      const string& facet,
 				      Reference::Mode mode,
 				      bool secure,
@@ -78,9 +77,9 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     // Create new reference
     //
 #ifdef ICEE_HAS_ROUTER
-    return new DirectReference(_instance, _communicator, ident, context, facet, mode, secure, endpoints, routerInfo);
+    return new DirectReference(_instance, _communicator, ident, facet, mode, secure, endpoints, routerInfo);
 #else
-    return new DirectReference(_instance, _communicator, ident, context, facet, mode, secure, endpoints);
+    return new DirectReference(_instance, _communicator, ident, facet, mode, secure, endpoints);
 #endif
 }
 
@@ -88,7 +87,6 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
 
 ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident,
-				      const SharedContextPtr& context,
 				      const string& facet,
 				      Reference::Mode mode,
 				      bool secure,
@@ -114,10 +112,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     // Create new reference
     //
 #ifdef ICEE_HAS_ROUTER
-    return new IndirectReference(_instance, _communicator, ident, context, facet, mode, secure, adapterId, routerInfo,
+    return new IndirectReference(_instance, _communicator, ident, facet, mode, secure, adapterId, routerInfo,
 				locatorInfo);
 #else
-    return new IndirectReference(_instance, _communicator, ident, context, facet, mode, secure, adapterId, locatorInfo);
+    return new IndirectReference(_instance, _communicator, ident, facet, mode, secure, adapterId, locatorInfo);
 #endif
 }
 
@@ -125,7 +123,6 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
 
 ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident,
-				      const SharedContextPtr& context,
 				      const string& facet,
 				      Reference::Mode mode,
 				      const vector<Ice::ConnectionPtr>& fixedConnections)
@@ -145,7 +142,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     //
     // Create new reference
     //
-    return new FixedReference(_instance, _communicator, ident, context, facet, mode, fixedConnections);
+    return new FixedReference(_instance, _communicator, ident, facet, mode, fixedConnections);
 }
 
 ReferencePtr
@@ -431,10 +428,9 @@ IceInternal::ReferenceFactory::create(const string& str)
     {
 #ifdef ICEE_HAS_LOCATOR
 #   ifdef ICEE_HAS_ROUTER
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", routerInfo,
-		      locatorInfo);
+	return create(ident, facet, mode, secure, "", routerInfo, locatorInfo);
 #   else
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", locatorInfo);
+	return create(ident, facet, mode, secure, "", locatorInfo);
 #   endif
 #else	
         FeatureNotSupportedException ex(__FILE__, __LINE__);
@@ -492,10 +488,9 @@ IceInternal::ReferenceFactory::create(const string& str)
 	    }
 
 #ifdef ICEE_HAS_ROUTER
-	    return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints,
-	    		  routerInfo);
+	    return create(ident, facet, mode, secure, endpoints, routerInfo);
 #else
-	    return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints);
+	    return create(ident, facet, mode, secure, endpoints);
 #endif
 	    break;
 	}
@@ -539,11 +534,9 @@ IceInternal::ReferenceFactory::create(const string& str)
 	    }
 
 #ifdef ICEE_HAS_ROUTER
-	    return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, 
-	    		  routerInfo, locatorInfo);
+	    return create(ident, facet, mode, secure, adapter, routerInfo, locatorInfo);
 #else
-	    return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter,
-	    		  locatorInfo);
+	    return create(ident, facet, mode, secure, adapter, locatorInfo);
 #endif
 #else
             FeatureNotSupportedException ex(__FILE__, __LINE__);
@@ -622,10 +615,9 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 	    endpoints.push_back(endpoint);
 	}
 #ifdef ICEE_HAS_ROUTER
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints,
-		      routerInfo);
+	return create(ident, facet, mode, secure, endpoints, routerInfo);
 #else
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints);
+	return create(ident, facet, mode, secure, endpoints);
 #endif
     }
     else
@@ -634,11 +626,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 	LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator());
 	s->read(adapterId);
 #   ifdef ICEE_HAS_ROUTER
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId,
+	return create(ident, facet, mode, secure, adapterId,
 		      routerInfo, locatorInfo);
 #   else
-	return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId,
-		      locatorInfo);
+	return create(ident, facet, mode, secure, adapterId, locatorInfo);
 #   endif
 #else
 	throw ProxyUnmarshalException(__FILE__, __LINE__);
diff --git a/cppe/src/IceE/ReferenceFactory.h b/cppe/src/IceE/ReferenceFactory.h
index 2ae20a1b6d6..9766b0e52e7 100644
--- a/cppe/src/IceE/ReferenceFactory.h
+++ b/cppe/src/IceE/ReferenceFactory.h
@@ -31,8 +31,8 @@ public:
     //
     // Create a direct reference.
     //
-    ReferencePtr create(const ::Ice::Identity&, const SharedContextPtr&, const ::std::string&,
-			Reference::Mode, bool, const ::std::vector<EndpointPtr>&
+    ReferencePtr create(const ::Ice::Identity&, const ::std::string&, Reference::Mode, bool,
+                        const ::std::vector<EndpointPtr>&
 #ifdef ICEE_HAS_ROUTER
 			, const RouterInfoPtr&
 #endif
@@ -41,8 +41,7 @@ public:
     // Create an indirect reference.
     //
 #ifdef ICEE_HAS_LOCATOR
-    ReferencePtr create(const ::Ice::Identity&, const SharedContextPtr&, const ::std::string&,
-			Reference::Mode, bool, const ::std::string&
+    ReferencePtr create(const ::Ice::Identity&, const ::std::string&, Reference::Mode, bool, const ::std::string&
 #ifdef ICEE_HAS_ROUTER
 			, const RouterInfoPtr&
 #endif
@@ -51,8 +50,8 @@ public:
     //
     // Create a fixed reference.
     //
-    ReferencePtr create(const ::Ice::Identity&, const SharedContextPtr&, const ::std::string&,
-	                Reference::Mode, const ::std::vector< ::Ice::ConnectionPtr>&);
+    ReferencePtr create(const ::Ice::Identity&, const ::std::string&, Reference::Mode,
+                        const ::std::vector< ::Ice::ConnectionPtr>&);
 
     //
     // Create a reference from a string.