diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-08-16 16:22:34 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-08-16 16:22:34 +0000 |
| commit | 988ea14cc6a504c6d5c7b9bfcbc01ca2b0a4e432 (patch) | |
| tree | 0ee0ebd2e7d7a1b0b00edf51b48286965b1b4fca /org/omg/CORBA_2_3 | |
| parent | e439fd75db6107e87660301775017154f05e1c06 (diff) | |
| download | classpath-988ea14cc6a504c6d5c7b9bfcbc01ca2b0a4e432.tar.gz | |
2005-08-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics-branch for 2005/08/07-2005/08/14.
Diffstat (limited to 'org/omg/CORBA_2_3')
| -rw-r--r-- | org/omg/CORBA_2_3/portable/InputStream.java | 13 | ||||
| -rw-r--r-- | org/omg/CORBA_2_3/portable/OutputStream.java | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/org/omg/CORBA_2_3/portable/InputStream.java b/org/omg/CORBA_2_3/portable/InputStream.java index 3ab264f60..06ee33e66 100644 --- a/org/omg/CORBA_2_3/portable/InputStream.java +++ b/org/omg/CORBA_2_3/portable/InputStream.java @@ -40,7 +40,9 @@ package org.omg.CORBA_2_3.portable; import gnu.CORBA.CDR.Vio; +import org.omg.CORBA.MARSHAL; import org.omg.CORBA.portable.BoxedValueHelper; +import org.omg.CORBA.portable.ValueFactory; import java.io.Serializable; @@ -170,7 +172,7 @@ public abstract class InputStream */ public Serializable read_value(Serializable unitialised_value) { - return Vio.read(this, unitialised_value); + return (Serializable) Vio.read(this, unitialised_value, null); } /** @@ -190,8 +192,11 @@ public abstract class InputStream */ public Serializable read_value(String repository_id) { - return ((org.omg.CORBA_2_3.ORB) orb()).lookup_value_factory(repository_id) - .read_value(this); + ValueFactory factory = + ((org.omg.CORBA_2_3.ORB) orb()).lookup_value_factory(repository_id); + if (factory == null) + throw new MARSHAL("No factory"); + return (Serializable) Vio.read(this, null, factory); } /** @@ -203,6 +208,6 @@ public abstract class InputStream */ public Serializable read_value(BoxedValueHelper helper) { - return helper.read_value(this); + return Vio.read(this, helper); } }
\ No newline at end of file diff --git a/org/omg/CORBA_2_3/portable/OutputStream.java b/org/omg/CORBA_2_3/portable/OutputStream.java index 2f83a939f..2ff8c226a 100644 --- a/org/omg/CORBA_2_3/portable/OutputStream.java +++ b/org/omg/CORBA_2_3/portable/OutputStream.java @@ -117,7 +117,7 @@ public abstract class OutputStream */ public void write_value(Serializable value, BoxedValueHelper helper) { - helper.write_value(this, value); + Vio.write(this, value, helper); } /** |