Menu
▾
▴
openorb-commits — A moderate volume list to track updates to the CVS repository.
You can subscribe to this list here.
| 2002 |
Jan
(887) |
Feb
(1041) |
Mar
(429) |
Apr
(147) |
May
(358) |
Jun
(378) |
Jul
(484) |
Aug
(501) |
Sep
(259) |
Oct
(934) |
Nov
(235) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(287) |
Feb
(571) |
Mar
(939) |
Apr
(282) |
May
(71) |
Jun
(4) |
Jul
|
Aug
(10) |
Sep
|
Oct
(121) |
Nov
(141) |
Dec
(32) |
| 2004 |
Jan
(119) |
Feb
(697) |
Mar
(12) |
Apr
(23) |
May
(34) |
Jun
(44) |
Jul
(270) |
Aug
(62) |
Sep
(4) |
Oct
(2) |
Nov
(35) |
Dec
(18) |
| 2005 |
Jan
(37) |
Feb
(7) |
Mar
(49) |
Apr
(1) |
May
(6) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <lk...@us...> - 2004-11-14 21:38:45
|
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 |
|
From: <lk...@us...> - 2004-11-14 21:38:45
|
Update of /cvsroot/openorb/OpenORB/src/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4887/src/config Modified Files: default.xml 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: default.xml =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/config/default.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- default.xml 22 Jul 2004 09:49:45 -0000 1.27 +++ default.xml 14 Nov 2004 21:38:35 -0000 1.28 @@ -655,7 +655,7 @@ <!-- NOTE: This feature has now been superseded by the stream decoration framework! - + The following properties are helpful for tracing IIOP communication on the socket layer. Tools as Ethereal are not suitable when it comes to threading issues, i.e. finding bugs in badly synchronized code where different threads write to the same socket. @@ -686,14 +686,36 @@ </description> </property> --> - - <property name="useNativeLibrary" value="false"> + + <property name="deserializationEngine" value="lazy:auto"> <description> - This property circumvents the automatic detection of the VM vendor and the - VM dependant marshaling engines by using a native library for the - RMI-IIOP and Java Valuetype unmarshaling. - Default is false. - The native library can be found in the native CVS module. + This property allows configuration of the deserialization engine to + use for RMI-IIOP and Java Serializable unmarshaling. + + Possible values: + + - 'auto': use automatic detection of the VM vendor and create a + VM dependent marshaling engine. For a list of supported VMs + please see the JavaDoc of the DeserializationKernelFactory class. + + - 'native': use a native library and JNI. This works with any VM but + requires native code plus special setup of the VM environment in your + operating system. The native library can be found in the native CVS module, + including precompiled binaries for some platforms. + + - 'none': no support for RMI-IIOP, even if your VM supports it. Use this + option to make sure that your software does not use any ORB features that + depend on the VM. + + A prefix of 'lazy:' avoids creation at ORB startup time and defers creation of the + deserialization engine until it is first used. + + Using 'lazy:' is not recommended if you need to achieve fail-fast behaviour. + Using the 'lazy:' prefix is recommended if you are not sending Serializables + over the wire - your application will work even if your VM is not supported + for 'auto' or the operating system is not set up correctly for 'native'. + + Default value for deserializationEngine is 'lazy:auto'. </description> </property> @@ -705,10 +727,10 @@ interface. If this set is empty then the set defaults to the entries stated below. </description> - + <!-- Handles boostReceivePriority functionality --> <property name="1" value="org.openorb.orb.net.PriorityBoostingSocketStreamDecorationStrategy$Factory" /> - + <!-- Handles bufferedInputStreamSize and bufferedOutputStreamSize functionality --> <property name="2" value="org.openorb.orb.net.BufferingSocketStreamDecorationStrategy$Factory" /> |
|
From: <lk...@us...> - 2004-11-14 21:38:44
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4887 Modified Files: WHATSNEW 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: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.230 retrieving revision 1.231 diff -u -d -r1.230 -r1.231 --- WHATSNEW 10 Nov 2004 19:19:56 -0000 1.230 +++ WHATSNEW 14 Nov 2004 21:38:35 -0000 1.231 @@ -1,6 +1,17 @@ OpenORB ------- +- Replaced boolean property iiop.useNativeLibrary with a new + property iiop.deserializationEngine to control the engine + used for RMI/IIOP valuetype deserialization. Possible + values are 'auto' (VM dependent engine, some VMs currently + not supported), native (use native code from openorb's native + module) and none (runtime errors when trying to use RMI/IIOP + deserialization). If the value is prefixed with 'lazy:' the + desrialization engine will be created on demand. + For a more detailed descriptions of the available options + please see default.xml. + - Fixed NPE in commandline parsing of IdlDoc tool. - Extended the test case FragmentedMessageTest to include |
|
From: Richard G C. <pim...@us...> - 2004-11-14 10:09:43
|
Update of /cvsroot/openorb/OpenORB/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13546/OpenORB/src Modified Files: build.xml Log Message: added missing default value Index: build.xml =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/build.xml,v retrieving revision 1.183 retrieving revision 1.184 diff -u -d -r1.183 -r1.184 --- build.xml 9 Aug 2004 10:04:36 -0000 1.183 +++ build.xml 14 Nov 2004 10:09:31 -0000 1.184 @@ -154,6 +154,8 @@ <os name="AIX" /> </condition> + <property name="useNativeLibrary" value="false"/> + <property name="default.jvmargs" value=" -Dfile.encoding=ISO8859-1 -Diiop.useNativeLibrary=${useNativeLibrary} |
|
From: <lk...@us...> - 2004-11-13 15:12:54
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20179 Modified Files: NullDeserializationKernel.java Log Message: fixed typo in javadoc Index: NullDeserializationKernel.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/NullDeserializationKernel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NullDeserializationKernel.java 11 Nov 2004 05:34:27 -0000 1.1 +++ NullDeserializationKernel.java 13 Nov 2004 15:12:46 -0000 1.2 @@ -12,7 +12,7 @@ * A {@link DeserializationKernel} that throws {@link UnsupportedOperationException} * for every operation. Using this implementation is sufficient for scenarios without * RMI/IIOP and avoids the neccessity to create a platform dependent kernel. See - * {@link DeserializationKernelFactory} why a DesrializationKernel is required for RMI/IIOP. + * {@link DeserializationKernelFactory} why a DeserializationKernel is required for RMI/IIOP. * * @author lkuehne */ |
|
From: <lk...@us...> - 2004-11-12 12:45:27
|
Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/ORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17297/src/main/org/openorb/ots/ORB Modified Files: TransactionalClientInterceptor.java TransactionalServerInterceptor.java Log Message: initialize the interceptor loggers properly Index: TransactionalClientInterceptor.java =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/ORB/TransactionalClientInterceptor.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TransactionalClientInterceptor.java 4 Jun 2004 10:32:17 -0000 1.10 +++ TransactionalClientInterceptor.java 12 Nov 2004 12:45:17 -0000 1.11 @@ -149,7 +149,7 @@ { if ( m_logger == null ) { - m_logger = new ConsoleLogger(); + m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO ); } return m_logger; } Index: TransactionalServerInterceptor.java =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/ORB/TransactionalServerInterceptor.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- TransactionalServerInterceptor.java 4 Jun 2004 10:32:17 -0000 1.9 +++ TransactionalServerInterceptor.java 12 Nov 2004 12:45:17 -0000 1.10 @@ -164,7 +164,7 @@ { if ( m_logger == null ) { - m_logger = new ConsoleLogger(); + m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO ); } return m_logger; } |
|
From: <lk...@us...> - 2004-11-12 12:45:27
|
Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17297/src/main/org/openorb/ots Modified Files: Initializer.java Log Message: initialize the interceptor loggers properly Index: Initializer.java =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Initializer.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Initializer.java 4 Jun 2004 09:58:47 -0000 1.7 +++ Initializer.java 12 Nov 2004 12:45:16 -0000 1.8 @@ -11,6 +11,7 @@ import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.logger.ConsoleLogger; import org.apache.avalon.framework.logger.LogEnabled; +import org.apache.avalon.framework.container.ContainerUtil; import org.omg.CORBA.INTERNAL; /** @@ -35,11 +36,19 @@ public void pre_init( org.omg.PortableInterceptor.ORBInitInfo info ) { getLogger().debug( "pre_init" ); + Logger clientInterceptorLogger = getLogger().getChildLogger( "TxnCltInt" ); + Logger serverInterceptorLogger = getLogger().getChildLogger( "TxnSrvInt" ); + m_slot = info.allocate_slot_id(); + org.openorb.ots.ORB.TransactionalClientInterceptor clientInterceptor = new org.openorb.ots.ORB.TransactionalClientInterceptor( info, m_slot ); + ContainerUtil.enableLogging( clientInterceptor, clientInterceptorLogger ); + org.openorb.ots.ORB.TransactionalServerInterceptor serverInterceptor = new org.openorb.ots.ORB.TransactionalServerInterceptor( info, m_slot ); + ContainerUtil.enableLogging( serverInterceptor, serverInterceptorLogger ); + try { info.add_client_request_interceptor( clientInterceptor ); @@ -81,7 +90,7 @@ { if ( m_logger == null ) { - m_logger = new ConsoleLogger(); + m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO ); } return m_logger; } |
|
From: <lk...@us...> - 2004-11-11 05:34:36
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6800 Added Files: NullDeserializationKernel.java Log Message: added NullDesrializationKernel, see discussion in openorb-user a few days ago --- NEW FILE: NullDeserializationKernel.java --- /* * Copyright (C) The Community OpenORB Project. All rights reserved. * * This software is published under the terms of The OpenORB Community Software * License version 1.0, a copy of which has been included with this distribution * in the LICENSE.txt file. */ package org.openorb.orb.rmi; /** * A {@link DeserializationKernel} that throws {@link UnsupportedOperationException} * for every operation. Using this implementation is sufficient for scenarios without * RMI/IIOP and avoids the neccessity to create a platform dependent kernel. See * {@link DeserializationKernelFactory} why a DesrializationKernel is required for RMI/IIOP. * * @author lkuehne */ public class NullDeserializationKernel implements DeserializationKernel { private static final String MSG = "This configuration of OpenORB does not support deserialization of valuetypes."; public Object allocateNewObject( Class c, Class base ) throws InstantiationException, IllegalAccessException { throw new UnsupportedOperationException( MSG ); } public void setObjectField( Class c, String n, Object o, Object v ) { throw new UnsupportedOperationException( MSG ); } public void setBooleanField( Class c, String n, Object o, boolean v ) { throw new UnsupportedOperationException( MSG ); } public void setByteField( Class c, String n, Object o, byte v ) { throw new UnsupportedOperationException( MSG ); } public void setCharField( Class c, String n, Object o, char v ) { throw new UnsupportedOperationException( MSG ); } public void setShortField( Class c, String n, Object o, short v ) { throw new UnsupportedOperationException( MSG ); } public void setIntField( Class c, String n, Object o, int v ) { throw new UnsupportedOperationException( MSG ); } public void setLongField( Class c, String n, Object o, long v ) { throw new UnsupportedOperationException( MSG ); } public void setFloatField( Class c, String n, Object o, float v ) { throw new UnsupportedOperationException( MSG ); } public void setDoubleField( Class c, String n, Object o, double v ) { throw new UnsupportedOperationException( MSG ); } } |
|
From: <lk...@us...> - 2004-11-10 19:20:19
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3632/src/compiler/org/openorb/compiler/doc Modified Files: IdlDoc.java Log Message: Fixed NPE in commandline parsing of IdlDoc tool. IMHO IdlDoc is still not production ready, though. Index: IdlDoc.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/doc/IdlDoc.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- IdlDoc.java 10 Nov 2004 17:44:07 -0000 1.5 +++ IdlDoc.java 10 Nov 2004 19:19:59 -0000 1.6 @@ -13,6 +13,7 @@ import java.net.URL; import java.util.Hashtable; import java.util.Vector; +import java.util.List; import org.openorb.compiler.CompilerProperties; import org.openorb.compiler.IdlCompiler; @@ -34,11 +35,6 @@ public static String [] idl_file_name; /** - * IDL files list - */ - public static java.util.Vector idl_file_name_list; - - /** * Generated package name */ public static String packageName = null; @@ -161,11 +157,13 @@ cp.setM_includeList(new Vector()); cp.setM_macros(new Hashtable()); + List idlFileNameList = new java.util.Vector(); + for ( int i = 0; i < args.length; i++ ) { if ( args[ i ].charAt( 0 ) != '-' ) { - idl_file_name_list.addElement( args[ i ] ); + idlFileNameList.add( args[ i ] ); } else if ( args[i].equals( "-h" ) ) { @@ -338,6 +336,9 @@ } } + idl_file_name = new String[idlFileNameList.size()]; + idlFileNameList.toArray(idl_file_name); + if ( packageName == null ) { packageName = "corba_pkg"; @@ -356,7 +357,6 @@ { IdlObject CompilationGraph; IdlParser Parser = null; - idl_file_name_list = new java.util.Vector(); CompilerProperties cp = new CompilerProperties(); // Scan the args if ( args.length != 0 ) |
|
From: <lk...@us...> - 2004-11-10 19:20:18
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3632 Modified Files: WHATSNEW Log Message: Fixed NPE in commandline parsing of IdlDoc tool. IMHO IdlDoc is still not production ready, though. Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.229 retrieving revision 1.230 diff -u -d -r1.229 -r1.230 --- WHATSNEW 20 Aug 2004 10:08:58 -0000 1.229 +++ WHATSNEW 10 Nov 2004 19:19:56 -0000 1.230 @@ -1,6 +1,8 @@ OpenORB ------- +- Fixed NPE in commandline parsing of IdlDoc tool. + - Extended the test case FragmentedMessageTest to include a simple check whether the returnedd array is not missing any of the data previously read from the XML file. |
|
From: <lk...@us...> - 2004-11-10 17:44:17
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14012 Modified Files: IdlDoc.java Log Message: reformat "if then else" cascade to make it readable Index: IdlDoc.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/doc/IdlDoc.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- IdlDoc.java 10 Feb 2004 21:02:36 -0000 1.4 +++ IdlDoc.java 10 Nov 2004 17:44:07 -0000 1.5 @@ -22,11 +22,11 @@ import org.openorb.compiler.parser.IdlParser; /** - * This class is the IDL parser for generating documentations + * This class is the IDL parser for generating documentations. */ public class IdlDoc { - private static final String IDL2JAVA_COMPILER = "IDL Documentation Tool"; + private static final String IDL2JAVA_COMPILER = "IDL Documentation Tool"; /** * IDL file name @@ -164,173 +164,186 @@ for ( int i = 0; i < args.length; i++ ) { if ( args[ i ].charAt( 0 ) != '-' ) + { idl_file_name_list.addElement( args[ i ] ); - else - if ( args[ i ].equals( "-h" ) ) - printUsage(); - else - if ( args[ i ].equals( "-html" ) ) + } + else if ( args[i].equals( "-h" ) ) + { + printUsage(); + } + else if ( args[i].equals( "-html" ) ) + { htmlDoc = true; - else - if ( args[ i ].equals( "-help" ) ) - printUsage(); - else - if ( args[ i ].equals( "-nopackage" ) ) - use_package = false; - else - if ( args[ i ].equals( "-noprefix" ) ) - usePrefix = false; - else - if ( args[ i ].equals( "-stylesheet" ) ) - stylesheet = true; - else - if ( args[ i ].equals( "-all" ) ) - cp.setM_map_all(true); - else - if ( args[ i ].startsWith( "-package:" ) ) - { - try - { - packageName = args[ i ].substring( 9, args[ i ].length() ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } - - if ( packageName.equals( "" ) ) - { - System.out.println( "Package name cannot be empty..." ); - System.exit( 0 ); - } - } - else - if ( args[ i ].startsWith( "-title:" ) ) - { - try - { - title = args[ i ].substring( 7, args[ i ].length() ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } - - } - else - if ( args[ i ].startsWith( "-header:" ) ) - { - try - { - header = args[ i ].substring( 7, args[ i ].length() ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } - - } - else - if ( args[ i ].startsWith( "-footer:" ) ) - { - try - { - footer = args[ i ].substring( 7, args[ i ].length() ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } + } + else if ( args[i].equals( "-help" ) ) + { + printUsage(); + } + else if ( args[i].equals( "-nopackage" ) ) + { + use_package = false; + } + else if ( args[i].equals( "-noprefix" ) ) + { + usePrefix = false; + } + else if ( args[i].equals( "-stylesheet" ) ) + { + stylesheet = true; + } + else if ( args[i].equals( "-all" ) ) + { + cp.setM_map_all(true); + } + else if ( args[i].startsWith( "-package:" ) ) + { + try + { + packageName = args[ i ].substring( 9, args[ i ].length() ); + } + catch ( StringIndexOutOfBoundsException ex ) + { + } - } - else - if ( args[ i ].startsWith( "-docname:" ) ) - { - try - { - filename = args[ i ].substring( 9, args[ i ].length() ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } + if ( packageName.equals( "" ) ) + { + System.out.println( "Package name cannot be empty..." ); + System.exit( 0 ); + } + } + else if ( args[i].startsWith( "-title:" ) ) + { + try + { + title = args[ i ].substring( 7, args[ i ].length() ); + } + catch ( StringIndexOutOfBoundsException ex ) + { } - } - else - if ( args[ i ].startsWith( "-outdir:" ) ) - { - try - { - outdir = args[ i ].substring( 8, args[ i ].length() ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } + } + else if ( args[i].startsWith( "-header:" ) ) + { + try + { + header = args[ i ].substring( 7, args[ i ].length() ); + } + catch ( StringIndexOutOfBoundsException ex ) + { } - if ( packageName == null ) - { - packageName = ""; - use_package = false; - } + } + else if ( args[i].startsWith( "-footer:" ) ) + { + try + { + footer = args[ i ].substring( 7, args[ i ].length() ); + } + catch ( StringIndexOutOfBoundsException ex ) + { + } + } + else if ( args[i].startsWith( "-docname:" ) ) + { + try + { + filename = args[ i ].substring( 9, args[ i ].length() ); + } + catch ( StringIndexOutOfBoundsException ex ) + { + } - } - else - if ( args[ i ].startsWith( "-codepage:" ) ) - { - try - { - codepage = args[ i ].substring( 10, args[ i ].length() ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } - } - else - if ( args[ i ].startsWith( "-I" ) ) - { - try - { - String name = args[ i ].substring( 2, args[ i ].length() ); - URL url = null; + } + else if ( args[i].startsWith( "-outdir:" ) ) + { + try + { + outdir = args[ i ].substring( 8, args[ i ].length() ); + } + catch ( StringIndexOutOfBoundsException ex ) + { + } - try - { - url = new URL( name ); - } - catch ( MalformedURLException ex ) - { - try - { - url = new java.io.File( name ).toURL(); - } - catch ( MalformedURLException ex1 ) - {} + if ( packageName == null ) + { + packageName = ""; + use_package = false; + } - } + } + else if ( args[i].startsWith( "-codepage:" ) ) + { + try + { + codepage = args[ i ].substring( 10, args[ i ].length() ); + } + catch ( StringIndexOutOfBoundsException ex ) + { + } + } + else if ( args[i].startsWith( "-I" ) ) + { + try + { + String name = args[ i ].substring( 2, args[ i ].length() ); + URL url = null; - if ( url != null ) - cp.getM_includeList().addElement( url ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } + try + { + url = new URL( name ); + } + catch ( MalformedURLException ex ) + { + try + { + url = new java.io.File( name ).toURL(); + } + catch ( MalformedURLException ex1 ) + { + } + } - } - else - if ( args[ i ].startsWith( "-D" ) ) - { - try - { - int idx = args[ i ].indexOf( '=' ); + if ( url != null ) + { + cp.getM_includeList().addElement( url ); + } + } + catch ( StringIndexOutOfBoundsException ex ) + { + } + } + else if ( args[i].startsWith( "-D" ) ) + { + try + { + int idx = args[ i ].indexOf( '=' ); - if ( idx < 0 ) - cp.getM_macros().put( args[ i ].substring( 2, args[ i ].length() ) , "" ); - else - cp.getM_macros().put( args[ i ].substring( 2, idx ) , args[ i ].substring( idx + 1 ) ); - } - catch ( StringIndexOutOfBoundsException ex ) - { } + if ( idx < 0 ) + { + cp.getM_macros().put( args[ i ].substring( 2, args[ i ].length() ) , "" ); + } + else + { + cp.getM_macros().put( args[ i ].substring( 2, idx ) , args[ i ].substring( idx + 1 ) ); + } + } + catch ( StringIndexOutOfBoundsException ex ) + { + } - } - else - { - System.out.println( "Bad parameter" ); - System.out.println( "Please, use no flag to display all compiler option flags" ); - System.exit( 0 ); - } + } + else + { + System.out.println( "Bad parameter: '" + args[i] + "'" ); + System.out.println( "Please, use no flag to display all compiler option flags" ); + System.exit( 0 ); + } } if ( packageName == null ) + { packageName = "corba_pkg"; + } - cp.setM_packageName(packageName); + cp.setM_packageName(packageName); } |
|
From: <lk...@us...> - 2004-10-25 12:25:33
|
Update of /cvsroot/openorb/tools/src/main/org/openorb/util/service In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv914/src/main/org/openorb/util/service Modified Files: ServiceBase.java Log Message: Fixed potential NPE in ServiceBase Index: ServiceBase.java =================================================================== RCS file: /cvsroot/openorb/tools/src/main/org/openorb/util/service/ServiceBase.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- ServiceBase.java 22 Jul 2004 07:18:29 -0000 1.37 +++ ServiceBase.java 25 Oct 2004 12:25:25 -0000 1.38 @@ -791,7 +791,7 @@ protected boolean bindToNamingService( String name, org.omg.CORBA.Object obj, ORB orb ) { String long_name = getLongName(); - boolean bNoNS = long_name.equals( NamingUtils.NS_NAME_LONG ); + boolean bNoNS = NamingUtils.NS_NAME_LONG.equals( long_name ); boolean bForcePrintIOR = false; try @@ -847,7 +847,7 @@ private void deregisterObjects() { String long_name = getLongName(); - boolean bNoNS = long_name.equals( NamingUtils.NS_NAME_LONG ); + boolean bNoNS = NamingUtils.NS_NAME_LONG.equals( long_name ); Iterator iter = m_nameObjectMap.keySet().iterator(); while ( iter.hasNext() ) |
|
From: <lk...@us...> - 2004-10-25 12:25:33
|
Update of /cvsroot/openorb/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv914 Modified Files: WHATSNEW Log Message: Fixed potential NPE in ServiceBase Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/tools/WHATSNEW,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- WHATSNEW 16 Aug 2004 12:02:15 -0000 1.80 +++ WHATSNEW 25 Oct 2004 12:25:24 -0000 1.81 @@ -1,6 +1,8 @@ OpenORB tools ------------- +- Fixed potential NPE in ServiceBase + - A memory leak on AIX, when using the native library for RMI-IIOP unmarshalling has been discovered. The new library jar fixes the problem. |
|
From: <lk...@us...> - 2004-09-21 12:54:54
|
Update of /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15350/src/main/org/openorb/notify/impl Modified Files: EventChannelImpl.java Log Message: Fixed ArrayIndexOutOfBoundsException in EventChannelImpl.reportConsumerAdminDestruction (bug #901213) Also use Arrays.equals() instead of building Strings to compare two byte arrays for equality Index: EventChannelImpl.java =================================================================== RCS file: /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl/EventChannelImpl.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- EventChannelImpl.java 10 Feb 2004 21:53:31 -0000 1.22 +++ EventChannelImpl.java 21 Sep 2004 12:54:44 -0000 1.23 @@ -8,6 +8,10 @@ package org.openorb.notify.impl; +import java.util.Arrays; +import java.util.ArrayList; +import java.util.List; + import org.omg.CosNotification.EventType; import org.omg.CosNotifyChannelAdmin.ConsumerAdminHelper; import org.omg.CosNotifyChannelAdmin.EventChannelFactoryHelper; @@ -898,14 +902,12 @@ { return; } - ConnectionInfo[] new_consumers = - new ConnectionInfo[ consumers.length - 1 ]; - int j = 0; + List newConsumersList = new ArrayList( consumers.length - 1 ); for ( int i = 0; i < consumers.length; i++ ) { - if ( new String( consumers[ i ].pid ).equals( new String( adminPid ) ) ) + if ( Arrays.equals( consumers[ i ].pid, adminPid ) ) { try { @@ -930,9 +932,14 @@ continue; } - new_consumers[ j++ ] = consumers[ i ]; + newConsumersList.add( consumers[ i ] ); } + ConnectionInfo[] new_consumers = + new ConnectionInfo[ newConsumersList.size() ]; + + newConsumersList.toArray( new_consumers ); + m_pssEventChannel.consumer_admins( new_consumers ); } @@ -954,7 +961,7 @@ int j = 0; for ( int i = 0; i < suppliers.length; i++ ) { - if ( new String( suppliers[ i ].pid ).equals( new String( adminPid ) ) ) + if ( Arrays.equals( suppliers[ i ].pid, adminPid ) ) { continue; } |
|
From: <lk...@us...> - 2004-09-21 12:54:53
|
Update of /cvsroot/openorb/NotificationService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15350 Modified Files: WHATSNEW Log Message: Fixed ArrayIndexOutOfBoundsException in EventChannelImpl.reportConsumerAdminDestruction (bug #901213) Also use Arrays.equals() instead of building Strings to compare two byte arrays for equality Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/NotificationService/WHATSNEW,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- WHATSNEW 29 Jul 2004 09:48:12 -0000 1.65 +++ WHATSNEW 21 Sep 2004 12:54:43 -0000 1.66 @@ -1,6 +1,9 @@ OpenORB NotificationService --------------------------- +- Fixed ArrayIndexOutOfBoundsException in + EventChannelImpl.reportConsumerAdminDestruction (bug #901213) + Version 1.4.0 BETA2 - July, 29 2004 - NotificationService_1_4_0_BETA2 - Added a test case for bug #524478. The exception does not seem to |
|
From: Richard G C. <pim...@us...> - 2004-09-10 16:56:49
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/pi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18089/OpenORB/src/main/org/openorb/orb/pi Modified Files: CurrentEntry.java Log Message: cleaned up code Index: CurrentEntry.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/pi/CurrentEntry.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CurrentEntry.java 10 Feb 2004 21:02:51 -0000 1.4 +++ CurrentEntry.java 10 Sep 2004 16:56:29 -0000 1.5 @@ -9,6 +9,10 @@ package org.openorb.orb.pi; import org.omg.CORBA.Any; +import org.omg.CORBA.ORB; +import org.omg.CORBA.TCKind; +import org.omg.PortableInterceptor.CurrentOperations; +import org.omg.PortableInterceptor.InvalidSlot; /** * Slot table for PICurrent. @@ -16,25 +20,25 @@ * @author Chris Wood * @version $Revision$ $Date$ */ -class CurrentEntry - implements org.omg.PortableInterceptor.CurrentOperations, Cloneable +class CurrentEntry implements CurrentOperations, Cloneable { + /** The ORB object used by this table. */ + private final ORB m_orb; + /** The number of slots stored in this table. */ - private int m_slots; + private final int m_slots; /** The slot table. */ - private Any [] m_table = null; + private Any [] m_table; /** The invocation context object. */ - private Object m_invocation_ctx = null; + private Object m_invocation_ctx; - /** The ORB object used by this table. */ - private org.omg.CORBA.ORB m_orb; /** * Constructor. */ - CurrentEntry( int slots, org.omg.CORBA.ORB orb ) + CurrentEntry( final int slots, final ORB orb ) { m_slots = slots; m_orb = orb; @@ -43,7 +47,7 @@ /** * Copy constructor. */ - CurrentEntry( CurrentEntry from ) + CurrentEntry( final CurrentEntry from ) { m_slots = from.m_slots; @@ -60,12 +64,11 @@ * @param id The slot id. * @return The data attached to the slot. */ - public org.omg.CORBA.Any get_slot( int id ) - throws org.omg.PortableInterceptor.InvalidSlot + public Any get_slot( final int id ) throws InvalidSlot { if ( id < 0 || id >= m_slots ) { - throw new org.omg.PortableInterceptor.InvalidSlot(); + throw new InvalidSlot(); } if ( m_table == null ) { @@ -74,8 +77,7 @@ if ( m_table[ id ] == null ) { m_table[ id ] = m_orb.create_any(); - m_table[ id ].type ( m_orb.get_primitive_tc( - org.omg.CORBA.TCKind.tk_null ) ); + m_table[ id ].type ( m_orb.get_primitive_tc( TCKind.tk_null ) ); } return m_table[ id ]; @@ -86,12 +88,11 @@ * @param id The slot id. * @param data The data to attach to the slot. */ - public void set_slot( int id, org.omg.CORBA.Any data ) - throws org.omg.PortableInterceptor.InvalidSlot + public void set_slot( final int id, final Any data ) throws InvalidSlot { if ( id < 0 || id >= m_slots ) { - throw new org.omg.PortableInterceptor.InvalidSlot(); + throw new InvalidSlot(); } if ( m_table == null ) { @@ -113,7 +114,7 @@ * Set the invocation context. * @param invocation_ctx The invocation context object. */ - public void set_invocation_ctx( Object invocation_ctx ) + public void set_invocation_ctx( final Object invocation_ctx ) { m_invocation_ctx = invocation_ctx; } |
|
From: Richard G C. <pim...@us...> - 2004-09-10 16:56:25
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/pi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17963/OpenORB/src/main/org/openorb/orb/pi Modified Files: CurrentImpl.java Log Message: fixed possible thread safety issue in CurrentImpl & cleaned up code Index: CurrentImpl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/pi/CurrentImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CurrentImpl.java 13 May 2004 23:54:13 -0000 1.4 +++ CurrentImpl.java 10 Sep 2004 16:56:08 -0000 1.5 @@ -10,9 +10,14 @@ import java.util.Map; import java.util.WeakHashMap; -import java.util.Collections; +import org.omg.CORBA.Any; +import org.omg.CORBA.BAD_INV_ORDER; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.ORB; +import org.omg.PortableInterceptor.Current; import org.omg.PortableInterceptor.CurrentOperations; +import org.omg.PortableInterceptor.InvalidSlot; /** * Implementation of PICurrent. @@ -20,20 +25,19 @@ * @author Chris Wood * @version $Revision$ $Date$ */ -public class CurrentImpl - extends org.omg.CORBA.LocalObject - implements org.omg.PortableInterceptor.Current +public class CurrentImpl extends LocalObject implements Current { + private final ORB m_orb; + private ThreadLocal m_curr = new ThreadLocal(); private Map m_stored_ctxts; - private int m_slots = 0; - private boolean m_slots_set = false; - private org.omg.CORBA.ORB m_orb; + private int m_slots; + private boolean m_slots_set; /** * Creates new CurrentImpl. */ - CurrentImpl( org.omg.CORBA.ORB orb ) + CurrentImpl( final ORB orb ) { m_orb = orb; } @@ -41,11 +45,11 @@ /** * Called at the end of the post init phase. Sets the slot count. */ - void set_slots( int slots ) + void set_slots( final int slots ) { if ( m_slots_set ) { - throw new org.omg.CORBA.BAD_INV_ORDER(); + throw new BAD_INV_ORDER(); } // create a new current stack. The old one's slot tables will be the // wrong size. @@ -67,7 +71,7 @@ /** * Copy a slot table. */ - public CurrentOperations copy( CurrentOperations from ) + public CurrentOperations copy( final CurrentOperations from ) { if ( from == null ) { @@ -75,9 +79,9 @@ } if ( !( from instanceof CurrentEntry ) ) { - throw new java.lang.IllegalArgumentException(); + throw new IllegalArgumentException(); } - CurrentEntry fr = ( CurrentEntry ) from; + final CurrentEntry fr = ( CurrentEntry ) from; if ( fr.get_table() == null ) { @@ -89,11 +93,11 @@ /** * Set a previously created or retrieved table. */ - public void set( CurrentOperations value ) + public void set( final CurrentOperations value ) { if ( value != null && !( value instanceof CurrentEntry ) ) { - throw new java.lang.IllegalArgumentException(); + throw new IllegalArgumentException(); } m_curr.set( value ); } @@ -103,7 +107,7 @@ */ public CurrentOperations remove() { - CurrentEntry ret = ( CurrentEntry ) m_curr.get(); + final CurrentEntry ret = ( CurrentEntry ) m_curr.get(); if ( ret != null ) { @@ -120,21 +124,19 @@ return ( CurrentOperations ) m_curr.get(); } - public void set_slot( int id, org.omg.CORBA.Any data ) - throws org.omg.PortableInterceptor.InvalidSlot + public void set_slot( final int id, final Any data ) throws InvalidSlot { get_p().set_slot( id, data ); } - public org.omg.CORBA.Any get_slot( int id ) - throws org.omg.PortableInterceptor.InvalidSlot + public Any get_slot( final int id ) throws InvalidSlot { return get_p().get_slot( id ); } public Object get_invocation_ctx() { - CurrentEntry ret = ( CurrentEntry ) m_curr.get(); + final CurrentEntry ret = ( CurrentEntry ) m_curr.get(); if ( ret == null ) { @@ -143,39 +145,42 @@ return ret.get_invocation_ctx(); } - public void set_invocation_ctx( Object invocation_ctx ) + public void set_invocation_ctx( final Object invocation_ctx ) { get_p().set_invocation_ctx( invocation_ctx ); } - public void store_invocation_ctx( Object handle ) + public void store_invocation_ctx( final Object handle ) { synchronized ( this ) { if ( m_stored_ctxts == null ) { - m_stored_ctxts = Collections.synchronizedMap( - new WeakHashMap() ); + m_stored_ctxts = new WeakHashMap(); } - } - CurrentEntry curr = get_p(); - m_stored_ctxts.put( handle, curr.get_invocation_ctx() ); + final CurrentEntry curr = get_p(); + + m_stored_ctxts.put( handle, curr.get_invocation_ctx() ); + } } - public Object retrieve_invocation_ctx( Object handle, boolean delete ) + public Object retrieve_invocation_ctx( final Object handle, final boolean delete ) { - if ( m_stored_ctxts == null ) - { - return null; - } - if ( delete ) - { - return m_stored_ctxts.remove( handle ); - } - else + synchronized ( this ) { - return m_stored_ctxts.get( handle ); + if ( m_stored_ctxts == null ) + { + return null; + } + if ( delete ) + { + return m_stored_ctxts.remove( handle ); + } + else + { + return m_stored_ctxts.get( handle ); + } } } @@ -196,7 +201,7 @@ * Replace LocalObject _orb() method for get orb in server/client * manager. */ - public org.omg.CORBA.ORB _orb() + public ORB _orb() { return m_orb; } |
|
From: Michael R. <mr...@us...> - 2004-08-20 10:09:08
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2500 Modified Files: WHATSNEW Log Message: Added items for the latest changes Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.228 retrieving revision 1.229 diff -u -d -r1.228 -r1.229 --- WHATSNEW 12 Aug 2004 12:54:23 -0000 1.228 +++ WHATSNEW 20 Aug 2004 10:08:58 -0000 1.229 @@ -1,6 +1,13 @@ OpenORB ------- +- Extended the test case FragmentedMessageTest to include + a simple check whether the returnedd array is not missing + any of the data previously read from the XML file. + +- Fixed a NPE in the ValueHandlerImpl class that occured + when the logger has not been set. + - Fixed some typos and improved some exception messages. - Added general method isGIOPHeaderOK to the Trace class. @@ -48,8 +55,7 @@ The flag must be set like this: private static final boolean DEBUG_ENABLED = - Boolean.getBoolean( System.getProperty( - "openorb.debug.enabled" ) ); + Boolean.getBoolean( "openorb.debug.enabled" ); A logger statement can then be wrapped like this: |
|
From: Michael R. <mr...@us...> - 2004-08-20 10:08:22
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2384/src/main/org/openorb/orb/rmi Modified Files: UtilDelegateImpl.java ValueHandlerImpl.java Log Message: Moved the child logger creation into the factory method. Index: UtilDelegateImpl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/UtilDelegateImpl.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- UtilDelegateImpl.java 28 Jul 2004 12:10:25 -0000 1.10 +++ UtilDelegateImpl.java 20 Aug 2004 10:08:13 -0000 1.11 @@ -604,7 +604,7 @@ getLogger().debug( "createValueHandler()" ); } - return ValueHandlerImpl.createValueHandler(); + return ValueHandlerImpl.createValueHandler( getLogger().getChildLogger( "vh" ) ); } /** Index: ValueHandlerImpl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/ValueHandlerImpl.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ValueHandlerImpl.java 13 May 2004 04:09:27 -0000 1.9 +++ ValueHandlerImpl.java 20 Aug 2004 10:08:13 -0000 1.10 @@ -24,6 +24,7 @@ import javax.rmi.CORBA.Util; import org.apache.avalon.framework.logger.AbstractLogEnabled; +import org.apache.avalon.framework.logger.Logger; import org.omg.CORBA.WStringValueHelper; import org.omg.CORBA_2_3.portable.InputStream; @@ -81,13 +82,15 @@ * instance. Subsequent calls to this method return the same * instance. * + * @param logger The logger for the ValueHandler instance. * @return The singleton ValueHandler instance. */ - public static synchronized ValueHandlerImpl createValueHandler() + public static synchronized ValueHandlerImpl createValueHandler( Logger logger ) { if ( s_value_handler_instance == null ) { s_value_handler_instance = new ValueHandlerImpl(); + s_value_handler_instance.enableLogging( logger ); } return s_value_handler_instance; } |
|
From: Michael R. <mr...@us...> - 2004-08-20 10:08:21
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/iiop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2384/src/main/org/openorb/orb/iiop Modified Files: CDRInputStream.java CDROutputStream.java Log Message: Moved the child logger creation into the factory method. Index: CDRInputStream.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/iiop/CDRInputStream.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- CDRInputStream.java 11 Aug 2004 10:25:55 -0000 1.21 +++ CDRInputStream.java 20 Aug 2004 10:08:12 -0000 1.22 @@ -260,8 +260,8 @@ m_wchar_enc = null; } - // get the singleton instance - s_handler = ValueHandlerImpl.createValueHandler(); + s_handler = ValueHandlerImpl.createValueHandler( + getLogger().getChildLogger( "vh" ) ); } /** @@ -282,7 +282,8 @@ } // get the singleton instance - s_handler = ValueHandlerImpl.createValueHandler(); + s_handler = ValueHandlerImpl.createValueHandler( + getLogger().getChildLogger( "vh" ) ); } /** Index: CDROutputStream.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/iiop/CDROutputStream.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- CDROutputStream.java 9 Apr 2004 16:15:49 -0000 1.16 +++ CDROutputStream.java 20 Aug 2004 10:08:12 -0000 1.17 @@ -353,12 +353,8 @@ } // get a value handler instance - synchronized ( this ) - { - ValueHandlerImpl vhimpl = ValueHandlerImpl.createValueHandler( ); - vhimpl.enableLogging( getLogger().getChildLogger( "vh" ) ); - s_handler = vhimpl; - } + s_handler = ValueHandlerImpl.createValueHandler( + getLogger().getChildLogger( "vh" ) ); } public MarshalBuffer getMarshalBuffer() @@ -497,7 +493,7 @@ /** * Begin an encapsulated block. This must be paired with an end_encapsulation - * later in the buffer. + * later in the buffer. */ public void begin_encapsulation() { |
|
From: Michael R. <mr...@us...> - 2004-08-20 09:58:19
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv875/src/main/org/openorb/orb/io Modified Files: MarshalBuffer.java Log Message: A call to size() does another call to prealloc() but that has already been done Index: MarshalBuffer.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/io/MarshalBuffer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- MarshalBuffer.java 12 Aug 2004 12:54:24 -0000 1.9 +++ MarshalBuffer.java 20 Aug 2004 09:58:10 -0000 1.10 @@ -23,7 +23,7 @@ public class MarshalBuffer { private static final boolean DEBUG_ENABLED = - Boolean.getBoolean( System.getProperty( "openorb.debug.enabled" ) ); + Boolean.getBoolean( "openorb.debug.enabled" ); private Logger m_logger; @@ -493,7 +493,7 @@ hd.m_lastHeaderFragment = m_header_fragment; - hd.m_position = size(); + hd.m_position = m_tail.m_fPosition; hd.m_generator = gen; @@ -561,7 +561,7 @@ m_last_block = bd; - bd.m_position = size(); + bd.m_position = m_tail.m_fPosition; bd.m_generator = gen; @@ -604,6 +604,8 @@ { throw new IllegalStateException( "End block without begin block" ); } + + // size() calls prealloc() and maybe postalloc()! m_last_block.m_generator.endBlock( m_last_block.m_buffer, m_last_block.m_offset, m_last_block.m_length, size() - m_last_block.m_position, m_last_block.m_cookie ); @@ -740,7 +742,7 @@ BlockData bd = m_last_block; m_last_block = null; bd.m_generator.fragmentBlock( bd.m_buffer, bd.m_offset, bd.m_length, - size() - bd.m_position, this, bd.m_cookie ); + m_tail.m_fPosition - bd.m_position, this, bd.m_cookie ); } int endpos = len + m_head.m_fPosition - m_head.m_fLength; @@ -810,7 +812,6 @@ m_tail.m_fMode = Scrap.SCRAP_MODE_NORMAL; m_tail.m_fPosition = endpos; - // call begin block on all the header blocks while ( firstHeader != null ) { firstHeader.m_generator.beginMessage( this, firstHeader.m_cookie ); |
|
From: Michael R. <mr...@us...> - 2004-08-20 09:39:11
|
Update of /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30446/src/test/org/openorb/orb/test/iiop/fragmentedmessage Modified Files: AttributeManagerImpl.java FragmentedMessageTest.java LocalContentHandler.java Log Message: Added a simple check whether the test was successful Index: AttributeManagerImpl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage/AttributeManagerImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AttributeManagerImpl.java 12 Aug 2004 14:30:56 -0000 1.2 +++ AttributeManagerImpl.java 20 Aug 2004 09:39:00 -0000 1.3 @@ -23,6 +23,7 @@ extends AttributeManagerPOA { private AttributeDefinition[] m_attributeDefinitions; + private int m_numberOfAttributeDefintions = 0; private POA m_poa; AttributeManagerImpl( POA aPOA ) @@ -61,8 +62,15 @@ m_attributeDefinitions = ( AttributeDefinition[] ) anAttributeDefinitionsList.toArray( new AttributeDefinition[ anAttributeDefinitionsList.size() ] ); + m_numberOfAttributeDefintions = + aLocalContentHandler.getNumberOfAttributeDefinitions(); } return m_attributeDefinitions; } + + public int getNumberOfAttributeDefintions() + { + return m_numberOfAttributeDefintions; + } } Index: FragmentedMessageTest.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage/FragmentedMessageTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- FragmentedMessageTest.java 12 Aug 2004 14:30:56 -0000 1.3 +++ FragmentedMessageTest.java 20 Aug 2004 09:39:00 -0000 1.4 @@ -82,6 +82,9 @@ + ".testGetAttributeDefinitions" ); AttributeDefinition[] anAttributeDefinitionArray = m_clientReference.getAttributeDefinitions(); + assertEquals( "The number of attribute definitions does not match!", + anAttributeDefinitionArray.length, + m_clientReference.getNumberOfAttributeDefintions() ); } /** Index: LocalContentHandler.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage/LocalContentHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- LocalContentHandler.java 12 Aug 2004 14:30:56 -0000 1.2 +++ LocalContentHandler.java 20 Aug 2004 09:39:00 -0000 1.3 @@ -70,6 +70,7 @@ private AttributeDefinition m_attributeDefinition; private boolean m_inAttributeData = false; private boolean m_inAttributeDefinition = false; + private int m_numberOfAttributeDefintions = 0; public LocalContentHandler( java.util.Collection aCollectionOfAttributeDefintions, ORB anORB ) { @@ -77,6 +78,11 @@ m_orb = anORB; } + public int getNumberOfAttributeDefinitions() + { + return m_numberOfAttributeDefintions; + } + public void startElement( String namespaceURI, String localName, String qName, org.xml.sax.Attributes atts ) throws org.xml.sax.SAXException @@ -135,7 +141,7 @@ m_collectionOfAttributeDefintions.add( m_attributeDefinition ); - return; + m_numberOfAttributeDefintions++; } } else @@ -177,6 +183,6 @@ public void endDocument() throws SAXException { - System.out.println( "Got end of document!!!!" ); + //System.out.println( "Got end of document!!!!" ); } } |
|
From: Michael R. <mr...@us...> - 2004-08-20 09:39:11
|
Update of /cvsroot/openorb/OpenORB/src/idl/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30446/src/idl/test Modified Files: fragmentedmessage.idl Log Message: Added a simple check whether the test was successful Index: fragmentedmessage.idl =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/idl/test/fragmentedmessage.idl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fragmentedmessage.idl 12 Aug 2004 14:30:55 -0000 1.2 +++ fragmentedmessage.idl 20 Aug 2004 09:39:00 -0000 1.3 @@ -82,6 +82,7 @@ interface AttributeManager { AttributeDefinitions getAttributeDefinitions(); + long getNumberOfAttributeDefintions(); }; }; }; |
|
From: Michael R. <mr...@us...> - 2004-08-16 12:02:25
|
Update of /cvsroot/openorb/tools/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24960/lib Modified Files: openorb_native.jar Log Message: New libs to fix a memory leak Index: openorb_native.jar =================================================================== RCS file: /cvsroot/openorb/tools/lib/openorb_native.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs61qHrq and /tmp/cvs0jHAOW differ |
|
From: Michael R. <mr...@us...> - 2004-08-16 12:02:25
|
Update of /cvsroot/openorb/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24960 Modified Files: WHATSNEW Log Message: New libs to fix a memory leak Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/tools/WHATSNEW,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- WHATSNEW 11 Aug 2004 11:02:46 -0000 1.79 +++ WHATSNEW 16 Aug 2004 12:02:15 -0000 1.80 @@ -1,6 +1,10 @@ OpenORB tools ------------- +- A memory leak on AIX, when using the native library for RMI-IIOP + unmarshalling has been discovered. The new library jar fixes the + problem. + - Added a variable DEBUGGER_SUSPEND to the launchdbg script to allow the user to influence the debugger suspend behaviour. Setting 'export DEBUGGER_SUSPEND=y' makes the application wait |
2 messages has been excluded from this view by a project administrator.
