minor clean up in java8 Incoming

zhakui · Aug 31, 2016 · 1bc89bc · 1bc89bc
1 parent 1ece3a0
commit 1bc89bc
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Incoming.java
@@ -813,19 +813,6 @@ else if(ex instanceof com.zeroc.Ice.OperationNotExistException)
             handleException(ex.getCause(), amd);
             return;
         }
-        catch(java.lang.Error ex)
-        {
-            com.zeroc.Ice.UnknownException uex = new com.zeroc.Ice.UnknownException(exc);
-            java.io.StringWriter sw = new java.io.StringWriter();
-            java.io.PrintWriter pw = new java.io.PrintWriter(sw);
-            exc.printStackTrace(pw);
-            pw.flush();
-            uex.unknown = sw.toString();
-
-            handleException(uex, amd);
-
-            throw new ServantError(exc);
-        }
         catch(Throwable ex)
         {
             if(_instance.initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
@@ -861,6 +848,11 @@ else if(ex instanceof com.zeroc.Ice.OperationNotExistException)
             {
                 _responseHandler.sendNoResponse();
             }
+
+            if(ex instanceof java.lang.Error)
+            {
+                throw new ServantError((java.lang.Error)ex);
+            }
         }
 
         if(_observer != null)