|
From: Michael R. <mr...@us...> - 2004-08-11 10:25:00
|
Update of /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/rmi/complex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24852/org/openorb/orb/test/rmi/complex Modified Files: IDLStructHelper.java Log Message: Fixed DCL Index: IDLStructHelper.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/rmi/complex/IDLStructHelper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- IDLStructHelper.java 19 Feb 2004 07:21:32 -0000 1.4 +++ IDLStructHelper.java 11 Aug 2004 10:24:45 -0000 1.5 @@ -49,23 +49,17 @@ { if ( s_typeCode == null ) { - synchronized ( org.omg.CORBA.TypeCode.class ) + if ( s_active ) { - if ( s_typeCode == null ) - { - if ( s_active ) - { - TypeCode typecode = ORB.init().create_recursive_tc( s_id ); - return typecode; - } - s_active = true; - StructMember[] members = new StructMember[ 1 ]; - TypeCode tcmember = ORB.init().get_primitive_tc( TCKind.tk_short ); - members[ 0 ] = new StructMember( "x", tcmember, null ); - s_typeCode = ORB.init().create_struct_tc( id(), "IDLStruct", members ); - s_active = false; - } + TypeCode typecode = ORB.init().create_recursive_tc( s_id ); + return typecode; } + s_active = true; + StructMember[] members = new StructMember[ 1 ]; + TypeCode tcmember = ORB.init().get_primitive_tc( TCKind.tk_short ); + members[ 0 ] = new StructMember( "x", tcmember, null ); + s_typeCode = ORB.init().create_struct_tc( id(), "IDLStruct", members ); + s_active = false; } return s_typeCode; } |