summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose <pepone@users.noreply.github.com>2021-01-08 23:44:50 +0100
committerGitHub <noreply@github.com>2021-01-08 23:44:50 +0100
commit4419db6dc600b41141c23ede1c6895cbc898e819 (patch)
treefbb5b3769febe09a7caeb9e709480401515ba684 /js
parentFix Bogus name for metrics Request Id field - Close #906 (diff)
downloadice-4419db6dc600b41141c23ede1c6895cbc898e819.tar.bz2
ice-4419db6dc600b41141c23ede1c6895cbc898e819.tar.xz
ice-4419db6dc600b41141c23ede1c6895cbc898e819.zip
Fix C# marshal/unmarshal of optional data members (#1232)
See #889
Diffstat (limited to 'js')
-rw-r--r--js/test/Ice/optional/AMDInitialI.js2
-rw-r--r--js/test/Ice/optional/Client.js2
-rw-r--r--js/test/Ice/optional/InitialI.js2
-rw-r--r--js/test/Ice/optional/Test.ice2
4 files changed, 8 insertions, 0 deletions
diff --git a/js/test/Ice/optional/AMDInitialI.js b/js/test/Ice/optional/AMDInitialI.js
index 42512d74cf2..edf34be6ce0 100644
--- a/js/test/Ice/optional/AMDInitialI.js
+++ b/js/test/Ice/optional/AMDInitialI.js
@@ -65,6 +65,8 @@
ex.o = o;
ex.o2 = o;
}
+ ex.d1 = "d1";
+ ex.d2 = "d2";
throw ex;
}
diff --git a/js/test/Ice/optional/Client.js b/js/test/Ice/optional/Client.js
index e2b3b350a00..beffe0ae20c 100644
--- a/js/test/Ice/optional/Client.js
+++ b/js/test/Ice/optional/Client.js
@@ -716,6 +716,8 @@
test(ex.o === undefined);
test(ex.ss === undefined);
test(ex.o2 === undefined);
+ test(ex.d1 == "d1");
+ test(ex.d2 == "d2");
}
try
diff --git a/js/test/Ice/optional/InitialI.js b/js/test/Ice/optional/InitialI.js
index d647b33cd95..1ce210e30dc 100644
--- a/js/test/Ice/optional/InitialI.js
+++ b/js/test/Ice/optional/InitialI.js
@@ -65,6 +65,8 @@
ex.o = o;
ex.o2 = o;
}
+ ex.d1 = "d1";
+ ex.d2 = "d2";
throw ex;
}
diff --git a/js/test/Ice/optional/Test.ice b/js/test/Ice/optional/Test.ice
index cafbb34c352..9c31ca04e0b 100644
--- a/js/test/Ice/optional/Test.ice
+++ b/js/test/Ice/optional/Test.ice
@@ -141,8 +141,10 @@ exception OptionalException
exception DerivedException extends OptionalException
{
+ string d1;
optional(600) string ss = "test";
optional(601) OneOptional o2;
+ string d2;
}
exception RequiredException extends OptionalException