incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r486936 - in /incubator/yoko/trunk: core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ArrayDescriptor.java
Date Thu, 14 Dec 2006 02:28:01 GMT
Author: rickmcguire
Date: Wed Dec 13 18:28:01 2006
New Revision: 486936

URL: http://svn.apache.org/viewvc?view=rev&rev=486936
Log:
YOKO-247 Marshaling of Class objects not working correctly.


Modified:
    incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java
    incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ArrayDescriptor.java

Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java?view=diff&rev=486936&r1=486935&r2=486936
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java Wed Dec
13 18:28:01 2006
@@ -911,10 +911,6 @@
             	remoteCodeBase = ((CodeBaseProxy) remoteCodeBase).getCodeBase();
             }
 
-            if (clz != null && repoClass != null && !clz.isAssignableFrom(repoClass))
{
-                throw new org.omg.CORBA.MARSHAL("Incompatible type " + className);
-            }
-
             return valueHandler.readValue (in_, h.headerPos, repoClass,
                     repid, remoteCodeBase);
 

Modified: incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ArrayDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ArrayDescriptor.java?view=diff&rev=486936&r1=486935&r2=486936
==============================================================================
--- incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ArrayDescriptor.java
(original)
+++ incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ArrayDescriptor.java
Wed Dec 13 18:28:01 2006
@@ -243,7 +243,7 @@
 
             for (int i = 0; i < length; i++) {
                 try {
-                    arr[i] = reader.readValueObject();
+                    arr[i] = reader.readAny();
                 } catch (org.omg.CORBA.portable.IndirectionException ex) {
                     arr[i] = offsetMap.get(new Integer(ex.offset));
                     // reader.addValueBox (ex.offset, new ArrayBox (i, arr));



Mime
View raw message