Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4887/src/main/org/openorb/orb/config
Modified Files:
OpenORBLoader.java
Log Message:
removed property iiop.useNativeLibrary in favour of iiop.deserializationEngine
Allow lazy initialization of DeserializationKernel and make lazy:auto the default behaviour
On Sun JDK 1.5 test errors are down to one error in PrimitiveTest.testValuetypes() because of lazy initialization
Index: OpenORBLoader.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/config/OpenORBLoader.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- OpenORBLoader.java 23 Jul 2004 09:54:02 -0000 1.26
+++ OpenORBLoader.java 14 Nov 2004 21:38:35 -0000 1.27
@@ -162,22 +162,27 @@
// NOTE: Do not try to access properties before this point !!!!!
m_properties = conf.getProperties();
- // set the property whether the RMI-IIOP marshalling engine uses a native
- // library or not.
- boolean useNativeLibrary = false;
+ // set the property which RMI-IIOP marshalling engine to use
+ // VM specific, native code
+ String deserializationEngine = "lazy:auto";
try
{
- final String value = m_properties.getStringProperty(
- "iiop.useNativeLibrary" );
- useNativeLibrary = Boolean.valueOf( value ).booleanValue();
+ deserializationEngine = m_properties.getStringProperty(
+ "iiop.deserializationEngine" );
}
catch ( PropertyNotFoundException ex )
{
// ignore, assume false
}
- m_logger.debug( "DeserializationKernel: iiop.useNativeLibrary=" + useNativeLibrary );
- org.openorb.orb.rmi.DeserializationKernelFactory.setUseNativeLibrary(
- useNativeLibrary );
+
+ if ( m_logger.isDebugEnabled() )
+ {
+ m_logger.debug( "DeserializationKernel: iiop.deserializationEngine="
+ + deserializationEngine );
+ }
+
+ org.openorb.orb.rmi.DeserializationKernelFactory.setDeserializationEngine(
+ deserializationEngine );
// print deprecation warnings
if ( ( m_properties.getProperty( "openorb.debug" ) != null
|
