diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-12-17 11:46:37 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-12-17 11:47:02 +0100 |
| commit | f7652d39e6ce2b3730343af11db81b8365ccc09d (patch) | |
| tree | 621b01835cde7a22dc5dc25871f97f3b1ef4eda0 | |
| parent | Update to NuGet 4.9.2 (diff) | |
| download | ice-f7652d39e6ce2b3730343af11db81b8365ccc09d.tar.bz2 ice-f7652d39e6ce2b3730343af11db81b8365ccc09d.tar.xz ice-f7652d39e6ce2b3730343af11db81b8365ccc09d.zip | |
Fixed quoting of UnexpectedObjectException message
| -rw-r--r-- | cpp/src/Ice/Exception.cpp | 4 | ||||
| -rw-r--r-- | csharp/src/Ice/Exception.cs | 4 | ||||
| -rw-r--r-- | java-compat/src/Ice/src/main/java/IceInternal/Ex.java | 4 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java | 4 | ||||
| -rw-r--r-- | js/src/Ice/ExUtil.js | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 1220cc8b76e..5909ed64524 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -82,8 +82,8 @@ throwUOE(const string& expectedType, const ValuePtr& v) string type = v->ice_id(); throw Ice::UnexpectedObjectException(__FILE__, __LINE__, - "expected element of type `" + expectedType + "' but received '" + - type, type, expectedType); + "expected element of type `" + expectedType + "' but received `" + + type + "'", type, expectedType); } void diff --git a/csharp/src/Ice/Exception.cs b/csharp/src/Ice/Exception.cs index e97c25aedd5..4f640970f2c 100644 --- a/csharp/src/Ice/Exception.cs +++ b/csharp/src/Ice/Exception.cs @@ -41,8 +41,8 @@ namespace IceInternal Debug.Assert(false); } - throw new Ice.UnexpectedObjectException("expected element of type `" + expected + "' but received '" + type, - type, expected); + throw new Ice.UnexpectedObjectException("expected element of type `" + expected + "' but received `" + + type + "'", type, expected); } public static void throwMemoryLimitException(int requested, int maximum) diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Ex.java b/java-compat/src/Ice/src/main/java/IceInternal/Ex.java index 0e810f54dcf..34c17b72781 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Ex.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Ex.java @@ -25,8 +25,8 @@ public class Ex } String type = v.ice_id(); - throw new Ice.UnexpectedObjectException("expected element of type `" + expectedType + "' but received '" + - type, type, expectedType); + throw new Ice.UnexpectedObjectException("expected element of type `" + expectedType + "' but received `" + + type + "'", type, expectedType); } public static void throwMemoryLimitException(int requested, int maximum) diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java index f8d5582091c..9309c4e5dfb 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Ex.java @@ -36,7 +36,7 @@ public class Ex assert(false); } throw new com.zeroc.Ice.UnexpectedObjectException( - "expected element of type `" + expected + "' but received '" + type, type, expected); + "expected element of type `" + expected + "' but received `" + type + "'", type, expected); } public static void throwUOE(String expectedType, com.zeroc.Ice.Value v) { @@ -53,7 +53,7 @@ public class Ex String type = v.ice_id(); throw new com.zeroc.Ice.UnexpectedObjectException( - "expected element of type `" + expectedType + "' but received '" + type, type, expectedType); + "expected element of type `" + expectedType + "' but received `" + type + "'", type, expectedType); } public static void throwMemoryLimitException(int requested, int maximum) diff --git a/js/src/Ice/ExUtil.js b/js/src/Ice/ExUtil.js index 7dc9191a40e..50135a7ce03 100644 --- a/js/src/Ice/ExUtil.js +++ b/js/src/Ice/ExUtil.js @@ -24,8 +24,8 @@ Ice.ExUtil = throwUOE: function(expectedType, v) { const type = v.ice_id(); - throw new UnexpectedObjectException("expected element of type `" + expectedType + "' but received '" + - type, type, expectedType); + throw new UnexpectedObjectException("expected element of type `" + expectedType + "' but received `" + + type + "'", type, expectedType); }, throwMemoryLimitException: function(requested, maximum) { |