INTEGRATION: CWS sb23 (1.14.10); FILE MERGED

2006/08/18 16:22:36 sb 1.14.10.2: RESYNC: (1.14-1.16); FILE MERGED
2005/03/15 10:29:36 sb 1.14.10.1: #88601# Support for current context in Java URP.
This commit is contained in:
Rüdiger Timm 2006-12-01 13:53:29 +00:00
parent 4fd65b4c15
commit 1e0b5f1a57

View file

@ -4,9 +4,9 @@
*
* $RCSfile: Unmarshal.java,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: rt $ $Date: 2006-05-04 08:08:52 $
* last change: $Author: rt $ $Date: 2006-12-01 14:53:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -92,6 +92,11 @@ final class Unmarshal {
return id;
}
public Object readInterface(Type type) {
String id = readObjectId();
return id == null ? null : bridge.mapInterfaceFrom(id, type);
}
public ThreadId readThreadId() {
int len = readCompressedNumber();
byte[] data = null;
@ -451,8 +456,7 @@ final class Unmarshal {
}
private Object readInterfaceValue(TypeDescription type) {
String id = readObjectId();
return id == null ? null : bridge.mapInterfaceFrom(id, new Type(type));
return readInterface(new Type(type));
}
private int readCompressedNumber() {