diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-06-27 15:46:37 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-06-27 15:46:37 -0700 |
| commit | 19871f29b2b6610a240a492e615e599f8187ec51 (patch) | |
| tree | edf9af1181ab798890caf37bb486e536e85eff57 /java | |
| parent | Fix for ICE-8118 - workaround to prevent C# Ice/exceptions test failure (diff) | |
| download | ice-19871f29b2b6610a240a492e615e599f8187ec51.tar.bz2 ice-19871f29b2b6610a240a492e615e599f8187ec51.tar.xz ice-19871f29b2b6610a240a492e615e599f8187ec51.zip | |
ICE-8166 - call fillInStackTrace in Java
Diffstat (limited to 'java')
6 files changed, 12 insertions, 12 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java index 922a92d4bf1..f296d684062 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectPrx.java @@ -972,11 +972,11 @@ public interface ObjectPrx } catch(RuntimeException ex) // Includes LocalException { - throw ex; + throw (LocalException)ex.fillInStackTrace(); } catch(UserException ex) { - throw ex; + throw (UserException)ex.fillInStackTrace(); } catch(Throwable ex) { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java index dbffde1de31..17048beace5 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/CommunicatorFlushBatch.java @@ -174,11 +174,11 @@ public class CommunicatorFlushBatch extends InvocationFutureI<Void> { try { - throw ee.getCause(); + throw ee.getCause().fillInStackTrace(); } catch(RuntimeException ex) // Includes LocalException { - throw ex; + throw (RuntimeException)ex.fillInStackTrace(); } catch(Throwable ex) { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java index cb3348f2daf..780cb795929 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFlushBatch.java @@ -79,11 +79,11 @@ public class ProxyFlushBatch extends ProxyOutgoingAsyncBaseI<Void> { try { - throw ee.getCause(); + throw ee.getCause().fillInStackTrace(); } catch(RuntimeException ex) // Includes LocalException { - throw ex; + throw (RuntimeException)ex.fillInStackTrace(); } catch(Throwable ex) { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java index 44921e2e183..b2458d35cdb 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyGetConnection.java @@ -76,11 +76,11 @@ public class ProxyGetConnection extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Co { try { - throw ee.getCause(); + throw ee.getCause().fillInStackTrace(); } catch(RuntimeException ex) // Includes LocalException { - throw ex; + throw (RuntimeException)ex.fillInStackTrace(); } catch(Throwable ex) { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java index 88778e268a7..17d5d663f60 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java @@ -88,11 +88,11 @@ public class ProxyIceInvoke extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Object { try { - throw ee.getCause(); + throw ee.getCause().fillInStackTrace(); } catch(RuntimeException ex) // Includes LocalException { - throw ex; + throw (RuntimeException)ex.fillInStackTrace(); } catch(Throwable ex) { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueExecutorService.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueExecutorService.java index e46698f178f..a825db1ad30 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueExecutorService.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/QueueExecutorService.java @@ -90,11 +90,11 @@ public final class QueueExecutorService { try { - throw e.getCause(); + throw e.getCause().fillInStackTrace(); } catch(RuntimeException ex) { - throw ex; + throw (RuntimeException)ex.fillInStackTrace(); } catch(Throwable ex) { |