diff options
| author | Joe George <joe@zeroc.com> | 2020-07-07 16:57:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 16:57:51 -0400 |
| commit | 6c0e7e6fcabde691e7c38a814b6171f9f4e77d09 (patch) | |
| tree | aed41fdff6561e134c73da214e580be0910e6f6a /csharp/src | |
| parent | Copy python dependencies to the extension directory - Close #926 (#927) (diff) | |
| download | ice-6c0e7e6fcabde691e7c38a814b6171f9f4e77d09.tar.bz2 ice-6c0e7e6fcabde691e7c38a814b6171f9f4e77d09.tar.xz ice-6c0e7e6fcabde691e7c38a814b6171f9f4e77d09.zip | |
Add class cycle detection during unmarshaling (#946)
Add support for detection of class cycles during unmarshaling in
languages which do no have garbage collection: C++, Swift, and Objective-C.
A `MarshalException` is thrown when a cycle is detected.
The property `Ice.AcceptClassCycles` can be set to a value greater than `0`
to change this behavior.
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/Ice/PropertyNames.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs index a4b0440ead6..d8926852333 100644 --- a/csharp/src/Ice/PropertyNames.cs +++ b/csharp/src/Ice/PropertyNames.cs @@ -1,7 +1,7 @@ // // Copyright (c) ZeroC, Inc. All rights reserved. // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Sep 6 18:11:04 2019 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Jul 2 14:55:02 2020 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -11,6 +11,7 @@ namespace IceInternal { public static Property[] IceProps = { + new Property(@"^Ice\.AcceptClassCycles$", false, null), new Property(@"^Ice\.ACM\.Client$", true, null), new Property(@"^Ice\.ACM\.Server$", true, null), new Property(@"^Ice\.ACM\.Timeout$", false, null), |