Fixed bug 1650

1 files changed, 1 insertions, 195 deletions

diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index 70615982807..8b8b1f1619a 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -155,177 +155,6 @@ final public class Incoming extends IncomingBase
 		}
 	    }
 	}
-	catch(Ice.RequestFailedException ex)
-	{
-	    _is.endReadEncaps();
-	    
-	    if(ex.id == null)
-	    {
-		ex.id = _current.id;
-	    }
-	    
-	    if(ex.facet == null)
-	    {
-		ex.facet = _current.facet;
-	    }
-	    
-	    if(ex.operation == null || ex.operation.length() == 0)
-	    {
-		ex.operation = _current.operation;
-	    }
-
-	    if(_os.instance().initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 1)
-	    {
-		__warning(ex);
-	    }
-
-            if(_response)
-            {
-                _os.endWriteEncaps();
-                _os.resize(Protocol.headerSize + 4, false); // Dispatch status position.
-		if(ex instanceof Ice.ObjectNotExistException)
-		{
-		    _os.writeByte((byte)DispatchStatus._DispatchObjectNotExist);
-		}
-		else if(ex instanceof Ice.FacetNotExistException)
-		{
-		    _os.writeByte((byte)DispatchStatus._DispatchFacetNotExist);
-		}
-		else if(ex instanceof Ice.OperationNotExistException)
-		{
-		    _os.writeByte((byte)DispatchStatus._DispatchOperationNotExist);
-		}
-		else
-		{
-		    assert(false);
-		}
-		ex.id.__write(_os);
-
-                //
-                // For compatibility with the old FacetPath.
-                //
-                if(ex.facet == null || ex.facet.length() == 0)
-                {
-                    _os.writeStringSeq(null);
-                }
-                else
-                {
-                    String[] facetPath2 = { ex.facet };
-                    _os.writeStringSeq(facetPath2);
-                }
-
-		_os.writeString(ex.operation);
-
-		_connection.sendResponse(_os, _compress);
-	    }
-	    else
-	    {
-		_connection.sendNoResponse();
-	    }
-
-	    return;
-        }
-        catch(Ice.UnknownLocalException ex)
-        {
-	    _is.endReadEncaps();
-
-	    if(_os.instance().initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
-	    {
-		__warning(ex);
-	    }
-
-            if(_response)
-            {
-                _os.endWriteEncaps();
-                _os.resize(Protocol.headerSize + 4, false); // Dispatch status position.
-                _os.writeByte((byte)DispatchStatus._DispatchUnknownLocalException);
-		_os.writeString(ex.unknown);
-		_connection.sendResponse(_os, _compress);
-	    }
-	    else
-	    {
-		_connection.sendNoResponse();
-	    }
-
-	    return;
-        }
-        catch(Ice.UnknownUserException ex)
-        {
-	    _is.endReadEncaps();
-
-	    if(_os.instance().initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
-	    {
-		__warning(ex);
-	    }
-
-            if(_response)
-            {
-                _os.endWriteEncaps();
-                _os.resize(Protocol.headerSize + 4, false); // Dispatch status position.
-                _os.writeByte((byte)DispatchStatus._DispatchUnknownUserException);
-		_os.writeString(ex.unknown);
-		_connection.sendResponse(_os, _compress);
-	    }
-	    else
-	    {
-		_connection.sendNoResponse();
-	    }
-
-	    return;
-        }
-        catch(Ice.UnknownException ex)
-        {
-	    _is.endReadEncaps();
-
-	    if(_os.instance().initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
-	    {
-		__warning(ex);
-	    }
-
-            if(_response)
-            {
-                _os.endWriteEncaps();
-                _os.resize(Protocol.headerSize + 4, false); // Dispatch status position.
-                _os.writeByte((byte)DispatchStatus._DispatchUnknownException);
-		_os.writeString(ex.unknown);
-		_connection.sendResponse(_os, _compress);
-	    }
-	    else
-	    {
-		_connection.sendNoResponse();
-	    }
-
-	    return;
-        }
-        catch(Ice.LocalException ex)
-        {
-	    _is.endReadEncaps();
-
-	    if(_os.instance().initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
-	    {
-		__warning(ex);
-	    }
-
-            if(_response)
-            {
-                _os.endWriteEncaps();
-                _os.resize(Protocol.headerSize + 4, false); // Dispatch status position.
-                _os.writeByte((byte)DispatchStatus._DispatchUnknownLocalException);
-		//_os.writeString(ex.toString());
-		java.io.StringWriter sw = new java.io.StringWriter();
-		java.io.PrintWriter pw = new java.io.PrintWriter(sw);
-		ex.printStackTrace(pw);
-		pw.flush();
-		_os.writeString(sw.toString());
-		_connection.sendResponse(_os, _compress);
-	    }
-	    else
-	    {
-		_connection.sendNoResponse();
-	    }
-
-	    return;
-        }
         /* Not possible in Java - UserExceptions are checked exceptions
         catch(Ice.UserException ex)
         {
@@ -335,30 +164,7 @@ final public class Incoming extends IncomingBase
         catch(java.lang.Exception ex)
         {
 	    _is.endReadEncaps();
-
-	    if(_os.instance().initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
-	    {
-		__warning(ex);
-	    }
-
-            if(_response)
-            {
-                _os.endWriteEncaps();
-                _os.resize(Protocol.headerSize + 4, false); // Dispatch status position.
-                _os.writeByte((byte)DispatchStatus._DispatchUnknownException);
-		//_os.writeString(ex.toString());
-		java.io.StringWriter sw = new java.io.StringWriter();
-		java.io.PrintWriter pw = new java.io.PrintWriter(sw);
-		ex.printStackTrace(pw);
-		pw.flush();
-		_os.writeString(sw.toString());
-		_connection.sendResponse(_os, _compress);
-	    }
-	    else
-	    {
-		_connection.sendNoResponse();
-	    }
-
+	    __handleException(ex);
 	    return;
         }