Mercurial > hg > icedtea7-forest > corba

changeset 880:7224b2d0d330 icedtea-2.6pre01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author andrew
date Thu, 03 Apr 2014 00:38:41 +0100
parents 767fcd9275bf (current diff) 394f83504abb (diff)
children 93adc35a9e14
files .hgtags
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Feb 20 15:02:15 2014 +0000
+++ b/.hgtags	Thu Apr 03 00:38:41 2014 +0100
@@ -417,3 +417,5 @@
 d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02
 47343904e95d315b5d2828cb3d60716e508656a9 icedtea-2.5pre01
 16906c5a09dab5f0f081a218f20be4a89137c8b1 icedtea-2.5pre02
+d7e98ed925a3885380226f8375fe109a9a25397f jdk7u60-b03
+1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u60-b04
--- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java	Thu Feb 20 15:02:15 2014 +0000
+++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java	Thu Apr 03 00:38:41 2014 +0100
@@ -587,7 +587,7 @@
             java.lang.Object[] objholder = new java.lang.Object[1];
             objholder[0] = object;
             long[] longholder = new long[1];
-            TCUtility.unmarshalIn(in, typeCode, longholder, objholder);
+            TCUtility.unmarshalIn(in, realType(), longholder, objholder);
             value = longholder[0];
             object = objholder[0];
             stream = null;