4 files changed, 19 insertions, 4 deletions
diff --git a/java/src/Ice/ObjectHolder.java b/java/src/Ice/ObjectHolder.java
index 9d1ad91e088..5d88becf0b9 100644
--- a/java/src/Ice/ObjectHolder.java
+++ b/java/src/Ice/ObjectHolder.java
@@ -34,6 +34,12 @@ public final class ObjectHolder
 	{
 	    value = v;
 	}
+
+	public String
+	type()
+	{
+	    return Ice.ObjectImpl.ice_staticId();
+	}
     }
 
     public Patcher
diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java
index 551ae4de307..eec827b0217 100644
--- a/java/src/Ice/ObjectImpl.java
+++ b/java/src/Ice/ObjectImpl.java
@@ -198,7 +198,7 @@ public class ObjectImpl implements Object, java.lang.Cloneable
     {
         synchronized(_activeFacetMap)
         {
-	    __os.writeTypeId("::Ice::Object");
+	    __os.writeTypeId(ice_staticId());
 	    __os.startWriteSlice();
             final int sz = _activeFacetMap.size();
             __os.writeSize(sz);
@@ -228,6 +228,12 @@ public class ObjectImpl implements Object, java.lang.Cloneable
 	    _activeFacetMap.put(__key, v);
 	}
 
+	public String
+	type()
+	{
+	    return ice_staticId();
+	}
+
 	private String __key;
     }
 
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index c157d980dae..09e68ff2f9a 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -1116,7 +1116,7 @@ public class BasicStream
 	while(true)
 	{
 	    String id = readTypeId();
-	    if(id.equals("::Ice::Object"))
+	    if(id.equals(Ice.ObjectImpl.ice_staticId()))
 	    {
 	        v = new Ice.ObjectImpl();
 	    }
@@ -1323,7 +1323,9 @@ public class BasicStream
 	    }
 	    catch(ClassCastException ex)
 	    {
-	        throw new Ice.UnmarshalOutOfBoundsException();
+		Ice.NoObjectFactoryException nof = new Ice.NoObjectFactoryException();
+		nof.type = p.type();
+	        throw nof;
 	    }
 	}
 
diff --git a/java/src/IceInternal/Patcher.java b/java/src/IceInternal/Patcher.java
index 11fdbf06adb..b5e30377bd0 100644
--- a/java/src/IceInternal/Patcher.java
+++ b/java/src/IceInternal/Patcher.java
@@ -17,4 +17,5 @@ package IceInternal;
 public interface Patcher
 {
     void patch(Ice.Object v);
-};
+    String type();
+}