1 files changed, 16 insertions, 5 deletions
diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java
index ccf13feb362..854f4d5f4b8 100644
--- a/java/src/Ice/ObjectImpl.java
+++ b/java/src/Ice/ObjectImpl.java
@@ -271,11 +271,22 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable
     {
 	if(expected != received)
 	{
-	    Ice.MarshalException ex = new Ice.MarshalException();
-	    ex.reason = "unexpected operation mode. expected = "
-			+ operationModeToString(expected) + " received = "
-			+ operationModeToString(received);
-	    throw ex;
+	    if(expected == Ice.OperationMode.Idempotent 
+	       && received == Ice.OperationMode.Nonmutating)
+	    {
+		//
+		// Fine: typically an old client still using the 
+                // deprecated nonmutating keyword
+		//
+	    }
+	    else
+	    {
+		Ice.MarshalException ex = new Ice.MarshalException();
+		ex.reason = "unexpected operation mode. expected = "
+		    + operationModeToString(expected) + " received = "
+		    + operationModeToString(received);
+		throw ex;
+	    }
 	}
     }
 }