Deprecate Proxy::ice_defaultContext

3 files changed, 7 insertions, 0 deletions

diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 7771f385503..b0f187de430 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -59,6 +59,9 @@ public interface ObjectPrx
      **/
     ObjectPrx ice_newContext(java.util.Map newContext);
     ObjectPrx ice_context(java.util.Map newContext);
+    /**
+     * @deprecated This method has been replaced with ice_context.
+     **/
     ObjectPrx ice_defaultContext();
 
     String ice_getFacet(); 
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index c8eff6f7be6..3884ebee0bd 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -344,6 +344,9 @@ public class ObjectPrxHelperBase implements ObjectPrx
         return ice_context(newContext);
     }
 
+    /**
+     * @deprecated
+     **/
     public final ObjectPrx
     ice_defaultContext()
     {
diff --git a/py/modules/IcePy/Proxy.cpp b/py/modules/IcePy/Proxy.cpp
index ee869aa18a4..45e726f194e 100644
--- a/py/modules/IcePy/Proxy.cpp
+++ b/py/modules/IcePy/Proxy.cpp
@@ -521,6 +521,7 @@ extern "C"
 static PyObject*
 proxyIceDefaultContext(ProxyObject* self)
 {
+    PyErr_Warn(PyExc_DeprecationWarning, STRCAST("ice_defaultContext is deprecated."));
     assert(self->proxy);
 
     Ice::ObjectPrx newProxy;