diff options
author | Andrew Haley <aph@redhat.com> | 2007-04-16 14:02:29 +0000 |
---|---|---|
committer | Andrew Haley <aph@redhat.com> | 2007-04-16 14:02:29 +0000 |
commit | a641fb2736feb1e59ab9dc52366d901f170247be (patch) | |
tree | f7fec20265e9cd0088c24179edc8d148fcecdf96 /org | |
parent | 64aefb8bf7bd2addd9b25b688bedd8da4f11e567 (diff) | |
download | classpath-a641fb2736feb1e59ab9dc52366d901f170247be.tar.gz |
2007-04-16 Andrew Haley <aph@redhat.com>
* org/omg/IOP/TaggedComponentHelper.java (read): Use
read_octet_array(), not read().
(write): Use write_octet_array(), not write().
* org/omg/PortableServer/Servant.java (_get_delegate): Throw if no
delegate has been set.
Diffstat (limited to 'org')
-rw-r--r-- | org/omg/IOP/TaggedComponentHelper.java | 28 | ||||
-rw-r--r-- | org/omg/PortableServer/Servant.java | 5 |
2 files changed, 9 insertions, 24 deletions
diff --git a/org/omg/IOP/TaggedComponentHelper.java b/org/omg/IOP/TaggedComponentHelper.java index 633891b9b..55090c746 100644 --- a/org/omg/IOP/TaggedComponentHelper.java +++ b/org/omg/IOP/TaggedComponentHelper.java @@ -136,18 +136,9 @@ public abstract class TaggedComponentHelper { TaggedComponent value = new TaggedComponent(); value.tag = input.read_long(); - value.component_data = new byte[input.read_long()]; - try - { - input.read(value.component_data); - } - catch (IOException e) - { - MARSHAL m = new MARSHAL(); - m.minor = Minor.Encapsulation; - m.initCause(e); - throw m; - } + int length = input.read_long(); + value.component_data = new byte[length]; + input.read_octet_array(value.component_data, 0, length); return value; } @@ -163,17 +154,6 @@ public abstract class TaggedComponentHelper { output.write_long(value.tag); output.write_long(value.component_data.length); - - try - { - output.write(value.component_data); - } - catch (IOException e) - { - MARSHAL m = new MARSHAL(); - m.minor = Minor.Encapsulation; - m.initCause(e); - throw m; - } + output.write_octet_array(value.component_data, 0, value.component_data.length); } }
\ No newline at end of file diff --git a/org/omg/PortableServer/Servant.java b/org/omg/PortableServer/Servant.java index 24eb715a9..fcb2cdd6a 100644 --- a/org/omg/PortableServer/Servant.java +++ b/org/omg/PortableServer/Servant.java @@ -39,6 +39,7 @@ exception statement from your version. */ package org.omg.PortableServer; import org.omg.CORBA.BAD_OPERATION; +import org.omg.CORBA.BAD_INV_ORDER; import org.omg.CORBA.NO_IMPLEMENT; import org.omg.CORBA.OBJECT_NOT_EXIST; import org.omg.CORBA.ORB; @@ -109,6 +110,10 @@ public abstract class Servant */ public final Delegate _get_delegate() { + if (delegate == null) { + throw new BAD_INV_ORDER + ("The Servant has not been associated with an ORBinstance"); + } return delegate; } |