diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-02-20 14:27:41 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-02-20 14:27:41 +0100 |
| commit | af1544e7b81e8708c5fdee05a59328558a3030fe (patch) | |
| tree | 0933eb39159b8cf714aab7fe5901d0515674d7c6 /java/src | |
| parent | Simplification to Atomic usage (diff) | |
| download | ice-af1544e7b81e8708c5fdee05a59328558a3030fe.tar.bz2 ice-af1544e7b81e8708c5fdee05a59328558a3030fe.tar.xz ice-af1544e7b81e8708c5fdee05a59328558a3030fe.zip | |
Fix for ICE-6268, initialize enum, string and structs in Java/C#/Objective-C/JavaScript
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/IncomingBase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java index 5a537ccb248..0ce16f152ec 100644 --- a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java @@ -325,12 +325,12 @@ class IncomingBase } catch(Ice.RequestFailedException ex) { - if(ex.id == null) + if(ex.id == null || ex.id.name == null || ex.id.name.isEmpty()) { ex.id = _current.id; } - if(ex.facet == null) + if(ex.facet == null || ex.facet.isEmpty()) { ex.facet = _current.facet; } |