Implicit Context implementation + test

1 files changed, 24 insertions, 1 deletions

diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java
index ce5f56f4a8a..2d0d47d0c6b 100644
--- a/java/src/Ice/_ObjectDelD.java
+++ b/java/src/Ice/_ObjectDelD.java
@@ -140,7 +140,30 @@ public class _ObjectDelD implements _ObjectDel
         current.facet = __reference.getFacet();
         current.operation = op;
         current.mode = mode;
-        current.ctx = context;
+
+	if(context != null)
+	{
+	    current.ctx = context;
+	}
+	else
+	{
+	    //
+	    // Implicit context
+	    //
+	    ImplicitContextI implicitContext =
+		__reference.getInstance().getImplicitContext();
+	    
+	    java.util.Map prxContext = __reference.getContext();
+	    
+	    if(implicitContext == null)
+	    {
+		current.ctx = new java.util.HashMap(prxContext);
+	    }
+	    else
+	    {
+		current.ctx = implicitContext.combine(prxContext);
+	    }
+	}
 	current.requestId = -1;
     }