diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-01-09 21:27:15 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-01-09 21:27:15 +0100 |
| commit | 5b2cdfebdd59ca3f99eb306e0ccf775fc0a81b83 (patch) | |
| tree | 3414c09ed68bbbda6d446a76c552e065c9e91108 /java/src/Ice/_ObjectDelM.java | |
| parent | Added info on mcpp (diff) | |
| download | ice-5b2cdfebdd59ca3f99eb306e0ccf775fc0a81b83.tar.bz2 ice-5b2cdfebdd59ca3f99eb306e0ccf775fc0a81b83.tar.xz ice-5b2cdfebdd59ca3f99eb306e0ccf775fc0a81b83.zip | |
- Fixed bug 1619, part of 2632.
Diffstat (limited to 'java/src/Ice/_ObjectDelM.java')
| -rw-r--r-- | java/src/Ice/_ObjectDelM.java | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java index a060df4fae3..297cfd8ac63 100644 --- a/java/src/Ice/_ObjectDelM.java +++ b/java/src/Ice/_ObjectDelM.java @@ -30,19 +30,22 @@ public class _ObjectDelM implements _ObjectDel boolean __ok = __og.invoke(); try { - IceInternal.BasicStream __is = __og.is(); if(!__ok) { try { - __is.throwException(); + __og.throwUserException(); } catch(UserException __ex) { throw new UnknownUserException(__ex.ice_name()); } } - return __is.readBool(); + IceInternal.BasicStream __is = __og.is(); + __is.startReadEncaps(); + boolean __ret = __is.readBool(); + __is.endReadEncaps(); + return __ret; } catch(LocalException __ex) { @@ -63,24 +66,27 @@ public class _ObjectDelM implements _ObjectDel try { boolean __ok = __og.invoke(); - try + if(!__og.is().isEmpty()) { - IceInternal.BasicStream __is = __og.is(); - if(!__ok) + try { - try - { - __is.throwException(); - } - catch(UserException __ex) + if(!__ok) { - throw new UnknownUserException(__ex.ice_name()); + try + { + __og.throwUserException(); + } + catch(UserException __ex) + { + throw new UnknownUserException(__ex.ice_name()); + } } + __og.is().skipEmptyEncaps(); + } + catch(LocalException __ex) + { + throw new IceInternal.LocalExceptionWrapper(__ex, false); } - } - catch(LocalException __ex) - { - throw new IceInternal.LocalExceptionWrapper(__ex, false); } } finally @@ -99,19 +105,22 @@ public class _ObjectDelM implements _ObjectDel boolean __ok = __og.invoke(); try { - IceInternal.BasicStream __is = __og.is(); if(!__ok) { try { - __is.throwException(); + __og.throwUserException(); } catch(UserException __ex) { throw new UnknownUserException(__ex.ice_name()); } } - return __is.readStringSeq(); + IceInternal.BasicStream __is = __og.is(); + __is.startReadEncaps(); + String[] __ret = __is.readStringSeq(); + __is.endReadEncaps(); + return __ret; } catch(LocalException __ex) { @@ -134,19 +143,22 @@ public class _ObjectDelM implements _ObjectDel boolean __ok = __og.invoke(); try { - IceInternal.BasicStream __is = __og.is(); if(!__ok) { try { - __is.throwException(); + __og.throwUserException(); } catch(UserException __ex) { throw new UnknownUserException(__ex.ice_name()); } } - return __is.readString(); + IceInternal.BasicStream __is = __og.is(); + __is.startReadEncaps(); + String __ret = __is.readString(); + __is.endReadEncaps(); + return __ret; } catch(LocalException __ex) { @@ -184,11 +196,13 @@ public class _ObjectDelM implements _ObjectDel try { IceInternal.BasicStream __is = __og.is(); + __is.startReadEncaps(); int sz = __is.getReadEncapsSize(); if(outParams != null) { outParams.value = __is.readBlob(sz); } + __is.endReadEncaps(); } catch(LocalException __ex) { |