User: reverbel Date: 02/04/04 10:54:43 Modified: jacorb/jacorb/lib README jacorb.jar Log: Updated to JacORB 1.4 beta 4, patched to fix problems with an RMI valuetype of class Foo that has a member field of class Foo or (even whose) has a member field that refers to itself. This update is important for jdk1.4, in which a Throwable instance t contains a member field of class Throwable that may refer to t. Revision Changes Path 1.4 +164 -2 thirdparty/jacorb/jacorb/lib/README Index: README =================================================================== RCS file: /cvsroot/jboss/thirdparty/jacorb/jacorb/lib/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README 21 Mar 2002 17:49:41 -0000 1.3 +++ README 4 Apr 2002 18:54:36 -0000 1.4 @@ -1,6 +1,9 @@ -The jacorb.jar file in this directory is from JacORB 1.4 beta 3, -available at http://www.jacorb.org. +The jacorb.jar file in this directory was generated from +JacORB 1.4 beta 4, available at http://www.jacorb.org, by +applying the patch below. These changes were already merged +into the CVS HEAD version of JacORB and will be in the next +official release of JacORB. Kudos to the JacORB team, for this great open-source ORB. @@ -12,3 +15,162 @@ Francisco + +------------------------------------------------------------------ +--- JacORB1_4_beta4/src/org/jacorb/orb/CDRInputStream.java Tue Mar 19 06:25:18 2002 ++++ JacORB/src/org/jacorb/orb/CDRInputStream.java Tue Apr 2 18:03:25 2002 +@@ -34,7 +34,7 @@ + * Read CDR encoded data + * + * @author Gerald Brose, FU Berlin +- * $Id: README,v 1.4 2002/04/04 18:54:36 reverbel Exp $ ++ * $Id: README,v 1.4 2002/04/04 18:54:36 reverbel Exp $ + */ + + public class CDRInputStream +@@ -784,9 +784,15 @@ + name = read_string(); + // Debug.output(4, "TC Union has name " + + // name + " at pos" + pos ); +- org.omg.CORBA.TypeCode discriminator_type = +- read_TypeCode(tcMap); ++ org.omg.CORBA.TypeCode discriminator_type = read_TypeCode(tcMap); + ++ // Use the dealiased discriminator type for the label types. ++ // This works because the JacORB IDL compiler ignores any aliasing ++ // of label types and only the discriminator type is passed on the ++ // wire. ++ org.omg.CORBA.TypeCode orig_disc_type = ++ ((org.jacorb.orb.TypeCode) discriminator_type).originalType(); ++ + int default_index = read_long(); + + // Debug.output(4, "TC Union has default idx: " + +@@ -811,7 +817,8 @@ + } + else + { +- label.read_value( this,discriminator_type ); ++ // use the dealiased discriminator type to construct labels ++ label.read_value( this, orig_disc_type ); + } + + String mn = read_string(); +@@ -1905,8 +1912,24 @@ + int index = read_long(); + index = index + pos - 4; + java.lang.Object value = valueMap.get (new Integer(index)); +- if (value == null) +- throw new org.omg.CORBA.MARSHAL ("stale value indirection"); ++ if (value == null) { ++ ++ // Java to IDL Language Mapping, v1.1, page 1-44: ++ // ++ // "The ValueHandler object may receive an IndirectionException ++ // from the ORB stream. The ORB input stream throws this exception ++ // when it is called to unmarshal a value encoded as an indirection ++ // that is in the process of being unmarshaled. This can occur when ++ // the ORB stream calls the ValueHandler object to unmarshal an RMI ++ // value whose state contains a recursive reference to itself. ++ // Because the top-level ValueHandler.readValue call has not yet ++ // returned a value, the ORB stream's indirection table contains no ++ // entry for an object with the stream offset specified by the ++ // indirection tag. This stream offset is returned in the ++ // exception's offset field." ++ ++ throw new org.omg.CORBA.portable.IndirectionException (index); ++ } + else + return (java.io.Serializable)value; + } +--- JacORB1_4_beta4/src/org/jacorb/orb/TypeCode.java Tue Mar 19 06:25:20 2002 ++++ JacORB/src/org/jacorb/orb/TypeCode.java Tue Apr 2 18:03:25 2002 +@@ -33,7 +33,7 @@ + * JacORB implementation of CORBA TypeCodes + * + * @author Gerald Brose, FU Berlin +- * @version $Id: README,v 1.4 2002/04/04 18:54:36 reverbel Exp $ ++ * @version $Id: README,v 1.4 2002/04/04 18:54:36 reverbel Exp $ + */ + + public class TypeCode +@@ -339,7 +339,15 @@ + this.name = name.replace('.','_'); // for orbixWeb Interop + value_modifier = type_modifier; + content_type = (TypeCode)concrete_base; ++ setValueMembers(members); ++ } + ++ /** ++ * Auxiliary method that sets the members of a tk_value. ++ */ ++ ++ private void setValueMembers(org.omg.CORBA.ValueMember[] members) ++ { + member_count = (members != null) ? members.length : 0; + member_name = new String[member_count]; + member_type = new TypeCode[member_count]; +@@ -1084,8 +1092,9 @@ + clz.getName(), + org.omg.CORBA.VM_NONE.value, + superTypeCode, +- getValueMembers (clz, knownTypes)); ++ new ValueMember[0]); + knownTypes.put (clz, newTypeCode); ++ newTypeCode.setValueMembers(getValueMembers (clz, knownTypes)); + return newTypeCode; + } + else +--- JacORB1_4_beta4/src/org/jacorb/orb/util/PrintIOR.java Tue Mar 19 06:25:35 2002 ++++ JacORB/src/org/jacorb/orb/util/PrintIOR.java Tue Apr 2 18:02:54 2002 +@@ -35,7 +35,7 @@ + + /** + * @author Gerald Brose +- * @version $Id: README,v 1.4 2002/04/04 18:54:36 reverbel Exp $ ++ * @version $Id: README,v 1.4 2002/04/04 18:54:36 reverbel Exp $ + */ + + public class PrintIOR +@@ -149,13 +149,6 @@ + " Tagged Components--" ); + + printTaggedComponents( pb.components ); +- String codebase = pior.getCodebaseComponent(); +- if( codebase != null ) +- { +- System.out.println("\tJava Codebase Component:\n\t\t" + codebase); +- } +- System.out.print("\n"); +- + } + System.out.print("\n"); + } +@@ -191,6 +184,10 @@ + System.out.println("\t#"+ i + ": TAG_CODE_SETS"); + printCodeSetComponent( taggedComponents[i] ); + break; ++ case TAG_JAVA_CODEBASE.value: ++ System.out.println("\t#"+ i + ": TAG_JAVA_CODEBASE"); ++ printJavaCodebaseComponent( taggedComponents[i] ); ++ break; + default: + System.out.println("\tUnknown tag : " + + taggedComponents[i].tag); +@@ -303,6 +300,16 @@ + + } + ++ private static void printJavaCodebaseComponent( TaggedComponent taggedComponent ) ++ { ++ CDRInputStream is = ++ new CDRInputStream( (org.omg.CORBA.ORB)null, ++ taggedComponent.component_data ); ++ ++ String codebase = is.read_string(); ++ ++ System.out.println( "\t\tCodebase: " + codebase ); ++ } + + public static void dumpHex(byte bs[]) + { 1.5 +14810 -14769thirdparty/jacorb/jacorb/lib/jacorb.jar <<Binary file>>
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
