User: reverbel
Date: 02/02/19 08:17:40
Added: iiop/lib/ext README jacorb-source-tree.tar.gz jacorb.diff
Log:
Sources for jacorb.jar.
Revision Changes Path
1.1 contrib/iiop/lib/ext/README
Index: README
===================================================================
The JacORB library (jacorb.jar) in this directrory is a patched
version of JacORB CVS head, checked out on 11/feb/2002.
The file jacorb-source-tree.jar.gz contains the JacORB source
tree I used to generate jacorb.jar. I am publishing the whole
source tree because I had no easy way of obtaining a diff against
the last "official" pre-release of JacORB release (1.4 beta 2,
from 20/nov/2001).
The file jacorb.diff is a patchfile relative to JacORB CVS head,
as of 11/feb/2002. I expect these changes (or equivalent ones) to
be merged into the next "official" release of JacORB. When this
happens, jacorb-source-tree.jar.gz and jacorb.diff will be removed
from this directory.
1.1 contrib/iiop/lib/ext/jacorb-source-tree.tar.gz
<<Binary file>>
1.1 contrib/iiop/lib/ext/jacorb.diff
Index: jacorb.diff
===================================================================
Index: src/omg-99-10-27/org/omg/CORBA/SetOverrideType.java
===================================================================
RCS file:
/home/bwana/brose/cvs_jacorb/JacORB/src/omg-99-10-27/org/omg/CORBA/SetOverrideType.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 SetOverrideType.java
--- SetOverrideType.java 2001/03/17 18:09:36 1.1.1.1
+++ SetOverrideType.java 2002/02/19 15:14:21
@@ -27,12 +27,12 @@
public static final SetOverrideType SET_OVERRIDE =
new SetOverrideType(_SET_OVERRIDE);
- public static final int _ADD = 1;
- public static final SetOverrideType ADD =
- new SetOverrideType(_ADD);
+ public static final int _ADD_OVERRIDE = 1;
+ public static final SetOverrideType ADD_OVERRIDE =
+ new SetOverrideType(_ADD_OVERRIDE);
public int value() {
- throw new org.omg.CORBA.NO_IMPLEMENT();
+ return _value;
}
public static SetOverrideType from_int(int val)
@@ -40,15 +40,17 @@
switch (val) {
case _SET_OVERRIDE:
return SET_OVERRIDE;
- case _ADD:
- return ADD;
+ case _ADD_OVERRIDE:
+ return ADD_OVERRIDE;
default:
throw new org.omg.CORBA.BAD_PARAM();
}
}
protected SetOverrideType(int _value) {
- throw new org.omg.CORBA.NO_IMPLEMENT();
+ this._value = _value;
}
+
+ private int _value;
}
Index: src/org/jacorb/orb/CDROutputStream.java
===================================================================
RCS file:
/home/bwana/brose/cvs_jacorb/JacORB/src/org/jacorb/orb/CDROutputStream.java,v
retrieving revision 1.32
diff -u -r1.32 CDROutputStream.java
--- CDROutputStream.java 2002/01/22 10:57:45 1.32
+++ CDROutputStream.java 2002/02/19 15:14:21
@@ -975,7 +975,31 @@
*/
int start_pos = pos+1;
- int _kind = value.kind().value();
+
+ // The initializer below throws a ClassCastException with IBM's jdk:
+ // int _kind = ((org.jacorb.orb.TypeCode)value)._kind();
+
+ // The initializer below throws org.omg.CORBA.BAD_PARAM with Sun's jdk:
+ // int _kind = value.kind().value();
+
+ // The conditional initializer below works:
+ int _kind = ((value instanceof org.jacorb.orb.TypeCode) ?
+ ((org.jacorb.orb.TypeCode)value)._kind() :
+ value.kind().value());
+
+ // This is here just for debugging:
+ if (value instanceof org.jacorb.orb.TypeCode) {
+ System.err.println(">>> (org.jacorb.orb.TypeCode)value)._kind(): "
+ + ((org.jacorb.orb.TypeCode)value)._kind());
+ try {
+ System.err.println(">>> value.kind().value(): "
+ + value.kind().value());
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
int _mc; // member count
try
@@ -1195,10 +1219,20 @@
}
break;
case TCKind._tk_abstract_interface:
- beginEncapsulation();
- write_string(value.id());
- write_string(value.name());
- endEncapsulation();
+ if( tcMap.containsKey( value.id()) )
+ {
+ writeRecursiveTypeCode( value, tcMap );
+ }
+ else
+ {
+ tcMap.put( value.id(), new Integer( start_pos ) );
+ recursiveTCMap.put( value.id(), value );
+ write_long( _kind );
+ beginEncapsulation();
+ write_string(value.id());
+ write_string(value.name());
+ endEncapsulation();
+ }
break;
default:
throw new RuntimeException("Cannot handle TypeCode, kind: " +
_kind);
Index: src/org/jacorb/orb/ORB.java
===================================================================
RCS file: /home/bwana/brose/cvs_jacorb/JacORB/src/org/jacorb/orb/ORB.java,v
retrieving revision 1.44
diff -u -r1.44 ORB.java
--- ORB.java 2002/01/11 17:26:48 1.44
+++ ORB.java 2002/02/19 15:14:23
@@ -294,7 +294,8 @@
byte[] objectId =
org.jacorb.poa.util.POAUtil.extractOID( ref );
- if( ! tmp_poa.previouslyGeneratedObjectId( objectId ))
+ if( tmp_poa.isSystemId()
+ && ! tmp_poa.previouslyGeneratedObjectId( objectId ))
{
Debug.output(3, "ORB.findPOA: not a previously generated object
key.");
return null;
Index: src/org/jacorb/poa/POA.java
===================================================================
RCS file: /home/bwana/brose/cvs_jacorb/JacORB/src/org/jacorb/poa/POA.java,v
retrieving revision 1.16
diff -u -r1.16 POA.java
--- POA.java 2001/12/17 16:52:12 1.16
+++ POA.java 2002/02/19 15:14:26
@@ -1237,7 +1237,7 @@
threadPolicy.value() == ThreadPolicyValue.SINGLE_THREAD_MODEL;
}
- protected boolean isSystemId()
+ public boolean isSystemId()
{
return idAssignmentPolicy == null ||
idAssignmentPolicy.value() == IdAssignmentPolicyValue.SYSTEM_ID;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
