4 files changed, 4 insertions, 100 deletions
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 0b2dcf00706..61b0f374a78 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -537,24 +537,6 @@ IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const
 
 #endif
 
-ObjectPrx
-IceProxy::Ice::Object::ice_default() const
-{
-    ReferencePtr ref = _reference->changeDefault();
-    ref = ref->changeDefault();
-
-    if(ref == _reference)
-    {
-	return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
-    }
-    else
-    {
-	ObjectPrx proxy(new ::IceProxy::Ice::Object());
-	proxy->setup(ref);
-	return proxy;
-    }
-}
-
 ConnectionPtr
 IceProxy::Ice::Object::ice_connection()
 {
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp
index df1cad4aa89..dc29b400091 100644
--- a/cppe/src/IceE/Reference.cpp
+++ b/cppe/src/IceE/Reference.cpp
@@ -103,17 +103,6 @@ IceInternal::Reference::changeFacet(const string& newFacet) const
     return r;
 }
 
-ReferencePtr
-IceInternal::Reference::changeDefault() const
-{
-    ReferencePtr r = _instance->referenceFactory()->copy(this);
-    r->_mode = ModeTwoway;
-    r->_secure = false;
-    r->_context = _instance->getDefaultContext();
-    r->_facet = "";
-    return r;
-}
-
 Int
 Reference::hash() const
 {
@@ -591,14 +580,6 @@ IceInternal::RoutableReference::getRoutedEndpoints() const
 }
 
 ReferencePtr
-IceInternal::RoutableReference::changeDefault() const
-{
-    RoutableReferencePtr r = RoutableReferencePtr::dynamicCast(Reference::changeDefault());
-    r->_routerInfo = getInstance()->routerManager()->get(getInstance()->referenceFactory()->getDefaultRouter());
-    return r;
-}
-
-ReferencePtr
 IceInternal::RoutableReference::changeRouter(const RouterPrx& newRouter) const
 {
     RouterInfoPtr newRouterInfo = getInstance()->routerManager()->get(newRouter);
@@ -710,32 +691,6 @@ IceInternal::DirectReference::changeEndpoints(const vector<EndpointPtr>& newEndp
     return r;
 }
 
-ReferencePtr
-IceInternal::DirectReference::changeDefault() const
-{
-    //
-    // Return an indirect reference if a default locator is set.
-    //
-#ifdef ICEE_HAS_LOCATOR
-    LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator();
-    if(loc)
-    {
-	LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(loc);
-#ifdef ICEE_HAS_ROUTER
-	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false,
-							 "", 0, newLocatorInfo);
-#else
-	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false,
-							 "", newLocatorInfo);
-#endif
-    }
-    else
-#endif // ICEE_HAS_LOCATOR
-    {
-	return Parent::changeDefault();
-    }
-}
-
 #ifdef ICEE_HAS_LOCATOR
 
 ReferencePtr
@@ -940,31 +895,6 @@ IceInternal::IndirectReference::getEndpoints() const
 }
 
 ReferencePtr
-IceInternal::IndirectReference::changeDefault() const
-{
-    //
-    // Return a direct reference if no default locator is defined.
-    //
-    LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator();
-    if(!loc)
-    {
-#ifdef ICEE_HAS_ROUTER
-	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false,
-							 vector<EndpointPtr>(), getRouterInfo());
-#else
-	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false,
-							 vector<EndpointPtr>());
-#endif
-    }
-    else
-    {
-	IndirectReferencePtr r = IndirectReferencePtr::dynamicCast(Parent::changeDefault());
-	r->_locatorInfo = getInstance()->locatorManager()->get(loc);
-	return r;
-    }
-}
-
-ReferencePtr
 IceInternal::IndirectReference::changeLocator(const LocatorPrx& newLocator) const
 {
     //
diff --git a/cppe/src/IceE/Reference.h b/cppe/src/IceE/Reference.h
index 7436ce9fa27..9380a25836a 100644
--- a/cppe/src/IceE/Reference.h
+++ b/cppe/src/IceE/Reference.h
@@ -69,11 +69,6 @@ public:
     ReferencePtr changeIdentity(const Ice::Identity&) const;
     ReferencePtr changeFacet(const std::string&) const;
 
-    //
-    // Return a reference in the default configuration.
-    //
-    virtual ReferencePtr changeDefault() const;
-
 #ifdef ICEE_HAS_ROUTER
     virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0;
 #endif
@@ -174,8 +169,6 @@ public:
     const RouterInfoPtr& getRouterInfo() const { return _routerInfo; }
     std::vector<EndpointPtr> getRoutedEndpoints() const;
 
-    virtual ReferencePtr changeDefault() const;
-
     virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
 
     virtual Ice::ConnectionPtr getConnection() const = 0;
@@ -219,8 +212,6 @@ public:
 
     DirectReferencePtr changeEndpoints(const std::vector<EndpointPtr>&) const;
 
-    virtual ReferencePtr changeDefault() const;
-
 #ifdef ICEE_HAS_LOCATOR
     virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
 #endif
@@ -274,8 +265,6 @@ public:
 
     virtual std::vector<EndpointPtr> getEndpoints() const;
 
-    virtual ReferencePtr changeDefault() const;
-
     virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
     virtual ReferencePtr changeTimeout(int) const;
 
diff --git a/cppe/src/IceE/RoutingTable.cpp b/cppe/src/IceE/RoutingTable.cpp
index fb6900f571b..d278bf6710b 100644
--- a/cppe/src/IceE/RoutingTable.cpp
+++ b/cppe/src/IceE/RoutingTable.cpp
@@ -43,7 +43,10 @@ IceInternal::RoutingTable::add(const ObjectPrx& prx)
 	return false;
     }
 
-    ObjectPrx proxy = prx->ice_default(); // We insert the proxy in its default form into the routing table.
+    //
+    // We insert the proxy in its default form into the routing table.
+    //
+    ObjectPrx proxy = prx->ice_twoway(); 
 
     IceUtil::Mutex::Lock sync(*this);