2 files changed, 10 insertions, 51 deletions

diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 5f324bd307f..96d0687cbb0 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -235,31 +235,17 @@ public class ObjectPrxHelperBase implements ObjectPrx
     public final ObjectPrx
     ice_newContext(java.util.Map newContext)
     {
-        if(_reference.hasContext() && newContext != null && newContext.equals(_reference.getContext()))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-            proxy.setup(_reference.changeContext(newContext));
-            return proxy;
-        }
+	ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
+	proxy.setup(_reference.changeContext(newContext));
+	return proxy;
     }
 
     public final ObjectPrx
     ice_defaultContext()
     {
-        if(!_reference.hasContext())
-	{
-	    return this;
-	}
-	else
-	{
-	    ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
-	    proxy.setup(_reference.defaultContext());
-	    return proxy;
-	}
+	ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
+	proxy.setup(_reference.defaultContext());
+	return proxy;
     }
 
     public final String
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 8fb52100283..09e944199fa 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -45,19 +45,14 @@ public abstract class Reference implements Cloneable
     public final java.util.Map
     getContext()
     {
-	return _hasContext ? _context : _instance.getDefaultContext();
+	return _context;
     }
 
     public final Reference
     defaultContext()
     {
-        if(!_hasContext)
-	{
-	    return this;
-	}
 	Reference r = _instance.referenceFactory().copy(this);
-	r._hasContext = false;
-	r._context = _emptyContext;
+	r._context = _instance.getDefaultContext();
 	return r;
 
     }
@@ -83,12 +78,7 @@ public abstract class Reference implements Cloneable
 	{
 	    newContext = _emptyContext;
 	}
-        if(_hasContext && newContext.equals(_context))
-	{
-	    return this;
-	}
 	Reference r = _instance.referenceFactory().copy(this);
-	r._hasContext = true;
 	if(newContext.isEmpty())
 	{
 	    r._context = _emptyContext;
@@ -131,12 +121,6 @@ public abstract class Reference implements Cloneable
 	return r;
     }
 
-    public final boolean
-    hasContext()
-    {
-        return _hasContext;
-    }
-
     public final Reference
     changeFacet(String newFacet)
     {
@@ -157,8 +141,7 @@ public abstract class Reference implements Cloneable
     {
 	Reference r = _instance.referenceFactory().copy(this);
 	r._mode = ModeTwoway;
-	r._hasContext = false;
-	r._context = _emptyContext;
+	r._context = _instance.getDefaultContext();
 	r._facet = "";
 	return r;
     }
@@ -192,10 +175,7 @@ public abstract class Reference implements Cloneable
             h = 5 * h + (int)_identity.category.charAt(i);
         }
 
-	if(_hasContext)
-	{
-	    h = 5 * h + _context.entrySet().hashCode();
-	}
+	h = 5 * h + _context.entrySet().hashCode();
 
         sz = _facet.length();
         for(int i = 0; i < sz; i++)
@@ -352,11 +332,6 @@ public abstract class Reference implements Cloneable
             return false;
         }
 
-	if(_hasContext != r._hasContext)
-	{
-	    return false;
-	}
-
 	if(!_context.equals(r._context))
 	{
 	    return false;
@@ -391,7 +366,6 @@ public abstract class Reference implements Cloneable
 
     private int _mode;
     private Ice.Identity _identity;
-    private boolean _hasContext;
     private java.util.Map _context;
     private static java.util.HashMap _emptyContext = new java.util.HashMap();
     private String _facet;
@@ -418,7 +392,6 @@ public abstract class Reference implements Cloneable
         _communicator = communicator;
         _mode = md;
         _identity = ident;
-	_hasContext = ctx != null && !ctx.isEmpty();
 	_context = ctx == null ? _emptyContext : ctx;
         _facet = fac;
 	_hashInitialized = false;