diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-03-23 15:29:25 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-03-23 15:29:25 +0100 |
| commit | 1597a75419cd8049252cfbca6fce6ae95ef8b2c7 (patch) | |
| tree | 2b2c858df1dbe68c1d576cae06c4713fd2ad5c40 /java/src | |
| parent | Use Ice\None with PHP namespace mapping (diff) | |
| download | ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.tar.bz2 ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.tar.xz ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.zip | |
Fix for ICE-7125 - Added support for Ice.ClassGraphDepthMax
Diffstat (limited to 'java/src')
3 files changed, 18 insertions, 7 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java index 296f0af7969..c1c33414122 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java @@ -2727,7 +2727,9 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler // // Suppress AssertionError and OutOfMemoryError, rethrow everything else. // - if(!(t instanceof java.lang.AssertionError || t instanceof java.lang.OutOfMemoryError)) + if(!(t instanceof java.lang.AssertionError || + t instanceof java.lang.OutOfMemoryError || + t instanceof java.lang.StackOverflowError)) { throw (java.lang.Error)t; } @@ -2752,7 +2754,9 @@ public final class ConnectionI extends com.zeroc.IceInternal.EventHandler // // Suppress AssertionError and OutOfMemoryError, rethrow everything else. // - if(!(ex instanceof java.lang.AssertionError || ex instanceof java.lang.OutOfMemoryError)) + if(!(ex instanceof java.lang.AssertionError || + ex instanceof java.lang.OutOfMemoryError || + ex instanceof java.lang.StackOverflowError)) { throw ex; } diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java index 7512638a7c0..a9a6ee0f919 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java @@ -341,7 +341,9 @@ public class CollocatedRequestHandler implements RequestHandler, ResponseHandler // // Suppress AssertionError and OutOfMemoryError, rethrow everything else. // - if(!(t instanceof java.lang.AssertionError || t instanceof java.lang.OutOfMemoryError)) + if(!(t instanceof java.lang.AssertionError || + t instanceof java.lang.OutOfMemoryError || + t instanceof java.lang.StackOverflowError)) { throw (java.lang.Error)t; } @@ -366,13 +368,17 @@ public class CollocatedRequestHandler implements RequestHandler, ResponseHandler // // Suppress AssertionError and OutOfMemoryError, rethrow everything else. // - if(!(ex instanceof java.lang.AssertionError || ex instanceof java.lang.OutOfMemoryError)) + if(!(ex instanceof java.lang.AssertionError || + ex instanceof java.lang.OutOfMemoryError || + ex instanceof java.lang.StackOverflowError)) { throw ex; } } - - _adapter.decDirectCount(); + finally + { + _adapter.decDirectCount(); + } } private void diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java index eb3319e9b46..77db7c18407 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Feb 28 15:01:12 2017 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Mar 23 15:24:16 2017 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -79,6 +79,7 @@ public final class PropertyNames new Property("Ice\\.BatchAutoFlush", true, null), new Property("Ice\\.BatchAutoFlushSize", false, null), new Property("Ice\\.ChangeUser", false, null), + new Property("Ice\\.ClassGraphDepthMax", false, null), new Property("Ice\\.ClientAccessPolicyProtocol", false, null), new Property("Ice\\.Compression\\.Level", false, null), new Property("Ice\\.CollectObjects", false, null), |