Added Ice::UserException::ice_getSlicedData and Ice::UnkownSlicedValue::ice_id methods

3 files changed, 23 insertions, 10 deletions

diff --git a/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java b/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java
index 77f180ace61..18c93cd9677 100644
--- a/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java
+++ b/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java
@@ -26,25 +26,26 @@ public final class UnknownSlicedValue extends ObjectImpl
     }
 
     /**
-     * Determine the Slice type ID associated with this object.
+     * Returns the sliced data if the value has a preserved-slice base class and has been sliced during
+     * un-marshaling of the value, null is returned otherwise.
      *
-     * @return The type ID.
+     * @return The sliced data or null.
      **/
-    public String getUnknownTypeId()
+    @Override
+    public SlicedData ice_getSlicedData()
     {
-        return _unknownTypeId;
+        return _slicedData;
     }
 
     /**
-     * Returns the sliced data if the value has a preserved-slice base class and has been sliced during
-     * un-marshaling of the value, null is returned otherwise.
+     * Determine the Slice type ID associated with this object.
      *
-     * @return The sliced data or null.
+     * @return The type ID.
      **/
     @Override
-    public SlicedData ice_getSlicedData()
+    public String ice_id()
     {
-        return _slicedData;
+        return _unknownTypeId;
     }
 
     @Override
diff --git a/java-compat/src/Ice/src/main/java/Ice/UserException.java b/java-compat/src/Ice/src/main/java/Ice/UserException.java
index 5e76c66222d..e88968dc18b 100644
--- a/java-compat/src/Ice/src/main/java/Ice/UserException.java
+++ b/java-compat/src/Ice/src/main/java/Ice/UserException.java
@@ -67,6 +67,18 @@ public abstract class UserException extends java.lang.Exception implements Clone
     ice_id();
 
     /**
+     * Returns the sliced data if the exception has a preserved-slice base class and has been sliced during
+     * un-marshaling, null is returned otherwise.
+     *
+     * @return The sliced data or null.
+     **/
+    public Ice.SlicedData
+    ice_getSlicedData()
+    {
+        return null;
+    }
+
+    /**
      * Returns a string representation of this exception.
      *
      * @return A string representation of this exception.
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Ex.java b/java-compat/src/Ice/src/main/java/IceInternal/Ex.java
index 1a25b392f3b..fc6e0f037d7 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Ex.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Ex.java
@@ -21,7 +21,7 @@ public class Ex
         if(v instanceof Ice.UnknownSlicedValue)
         {
             Ice.UnknownSlicedValue usv = (Ice.UnknownSlicedValue)v;
-            throw new Ice.NoValueFactoryException("", usv.getUnknownTypeId());
+            throw new Ice.NoValueFactoryException("", usv.ice_id());
         }
 
         String type = v.ice_id();