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-12-09 09:04:17
|
Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2579/src/main/org/openorb/ots/Impl Modified Files: Current.java Log Message: avoid debug message on the console in default logger configuration Index: Current.java =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/Current.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Current.java 4 Aug 2004 11:02:46 -0000 1.19 +++ Current.java 9 Dec 2004 09:04:03 -0000 1.20 @@ -779,7 +779,7 @@ { if ( m_logger == null ) { - m_logger = new ConsoleLogger(); + m_logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO); } return m_logger; } |
|
From: <lk...@us...> - 2004-11-20 13:11:54
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244 Modified Files: WHATSNEW Log Message: The value of boolean properties must now be one of true, false, yes, no, on, off. Other values are no longer recognized and will lead to INITIALIZE exceptions. Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.231 retrieving revision 1.232 diff -u -d -r1.231 -r1.232 --- WHATSNEW 14 Nov 2004 21:38:35 -0000 1.231 +++ WHATSNEW 20 Nov 2004 13:11:44 -0000 1.232 @@ -1,6 +1,10 @@ OpenORB ------- +- The value of boolean properties must now be one of true, false, yes, + no, on, off. Other values are no longer recognized and will lead to + INITIALIZE exceptions. + - Replaced boolean property iiop.useNativeLibrary with a new property iiop.deserializationEngine to control the engine used for RMI/IIOP valuetype deserialization. Possible |
|
From: <lk...@us...> - 2004-11-20 13:11:54
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26244/src/main/org/openorb/orb/config Modified Files: Property.java Log Message: The value of boolean properties must now be one of true, false, yes, no, on, off. Other values are no longer recognized and will lead to INITIALIZE exceptions. Index: Property.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/config/Property.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Property.java 13 May 2004 04:09:26 -0000 1.6 +++ Property.java 20 Nov 2004 13:11:44 -0000 1.7 @@ -11,9 +11,14 @@ import java.net.URL; import java.net.MalformedURLException; +import java.util.Set; +import java.util.TreeSet; + import org.openorb.util.ExceptionTool; import org.openorb.util.NumberCache; +import org.omg.CORBA.INITIALIZE; + /** * This class provides information about an OpenORB property. The class cannot * be constructed outside of the Properties class. @@ -23,25 +28,40 @@ */ public class Property { - Property( String name, String value, Properties props ) + private static final Set TRUE_SET = new TreeSet( String.CASE_INSENSITIVE_ORDER ); + private static final Set FALSE_SET = new TreeSet( String.CASE_INSENSITIVE_ORDER ); + + static + { + TRUE_SET.add( "true" ); + FALSE_SET.add( "false" ); + + TRUE_SET.add( "yes" ); + FALSE_SET.add( "no" ); + + TRUE_SET.add( "on" ); + FALSE_SET.add( "off" ); + } + + private final String m_name; + private final String m_value; + private Object m_typed; + private Properties m_props; + + Property( final String name, final String value, final Properties props ) { m_name = name; m_value = value; m_props = props; } - Property( String name, String value, Object typed ) + Property( final String name, final String value, final Object typed ) { m_name = name; m_value = value; m_typed = typed; } - private final String m_name; - private final String m_value; - private Object m_typed = null; - private Properties m_props = null; - /** * Get the property name. */ @@ -60,7 +80,7 @@ /** * Get the property value as an integer. - * @throws org.omg.CORBA.INITIALIZE the property value cannot be parsed as an int. + * @throws INITIALIZE the property value cannot be parsed as an int. */ public int getIntValue() { @@ -97,7 +117,7 @@ } catch ( final NumberFormatException ex ) { - throw ExceptionTool.initCause( new org.omg.CORBA.INITIALIZE( + throw ExceptionTool.initCause( new INITIALIZE( "The property value \"" + m_name + "\" cannot be parsed as an integer (" + ex + ")" ), ex ); } @@ -107,8 +127,8 @@ } /** - * Get the property value as a boolean. Property values of false or no are - * parsed as false, all other values are parsed as true. + * Get the property value as a boolean. + * @throws INITIALIZE the property value cannot be parsed as a boolean. */ public boolean getBooleanValue() { @@ -116,16 +136,24 @@ { return ( ( Boolean ) m_typed ).booleanValue(); } - boolean ret = !( m_value.equalsIgnoreCase( "false" ) || m_value.equalsIgnoreCase( "no" ) ); - - m_typed = ret ? Boolean.TRUE : Boolean.FALSE; - return ret; + if ( TRUE_SET.contains( m_value ) ) + { + m_typed = Boolean.TRUE; + return true; + } + else if ( FALSE_SET.contains( m_value ) ) + { + m_typed = Boolean.FALSE; + return false; + } + throw new INITIALIZE( "The property value \"" + m_name + + "\" cannot be parsed as a boolean (" + m_value + ")" ); } /** * Get the property value as a Class object. - * @throws org.omg.CORBA.INITIALIZE the property value cannot be loaded as a class. + * @throws INITIALIZE the property value cannot be loaded as a class. */ public Class getClassValue() { @@ -141,7 +169,7 @@ } catch ( final ClassNotFoundException ex ) { - throw ExceptionTool.initCause( new org.omg.CORBA.INITIALIZE( + throw ExceptionTool.initCause( new INITIALIZE( "The property value \"" + m_name + "\" cannot be loaded as a class (" + ex + ")" ), ex ); } @@ -149,7 +177,7 @@ /** * Get the property value as a URL. - * @throws org.omg.CORBA.INITIALIZE the property value cannot be parsed as a URL. + * @throws INITIALIZE the property value cannot be parsed as a URL. */ public URL getURLValue() { @@ -183,7 +211,7 @@ } } - throw ExceptionTool.initCause( new org.omg.CORBA.INITIALIZE( + throw ExceptionTool.initCause( new INITIALIZE( "The property value \"" + m_name + "\" cannot be parsed as a URL (" + ex + ")" ), ex ); } |
|
From: <lk...@us...> - 2004-11-20 12:53:12
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22758 Modified Files: Scrap.java Log Message: checkstyle fix Index: Scrap.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/io/Scrap.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Scrap.java 12 Aug 2004 12:54:24 -0000 1.5 +++ Scrap.java 20 Nov 2004 12:53:02 -0000 1.6 @@ -30,7 +30,7 @@ * | |-----m_fBuffer.length-----| | | |-----m_fBuffer.length-----| | * | | | | * +----------------------------------+ +----------------------------------+ - * + * * </pre> * * @author Chris Wood |
|
From: <lk...@us...> - 2004-11-19 23:20:33
|
Update of /cvsroot/openorb/OpenORB/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5048 Modified Files: build.xml Log Message: converted jvmargs from useNativeLibrary to deserializationEngine Index: build.xml =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/build.xml,v retrieving revision 1.184 retrieving revision 1.185 diff -u -d -r1.184 -r1.185 --- build.xml 14 Nov 2004 10:09:31 -0000 1.184 +++ build.xml 19 Nov 2004 23:20:16 -0000 1.185 @@ -150,15 +150,15 @@ <!-- =========================================== --> <!-- Default JVM arguments for running tests --> <!-- =========================================== --> - <condition property="useNativeLibrary" value="true"> + <condition property="deserializationEngine" value="lazy:native"> <os name="AIX" /> </condition> - <property name="useNativeLibrary" value="false"/> + <property name="deserializationEngine" value="lazy:auto"/> <property name="default.jvmargs" value=" -Dfile.encoding=ISO8859-1 - -Diiop.useNativeLibrary=${useNativeLibrary} + -Diiop.deserializationEngine=${deserializationEngine} -Dopenorb.debug.trace=${openorb.debug.trace} -Dopenorb.debug.level=${openorb.debug.level} -Dorg.omg.CORBA.ORBClass=org.openorb.orb.core.ORB |
|
From: <lk...@us...> - 2004-11-19 22:43:22
|
Update of /cvsroot/openorb/SSL/src/main/org/openorb/orb/ssl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27627/src/main/org/openorb/orb/ssl Modified Files: SSLTransportServerInitializer.java Log Message: renamed method getState() in subclasses of Thread to allow compilation on JDK 1.5 Index: SSLTransportServerInitializer.java =================================================================== RCS file: /cvsroot/openorb/SSL/src/main/org/openorb/orb/ssl/SSLTransportServerInitializer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- SSLTransportServerInitializer.java 10 Feb 2004 21:24:04 -0000 1.11 +++ SSLTransportServerInitializer.java 19 Nov 2004 22:43:05 -0000 1.12 @@ -371,7 +371,7 @@ // remove the thread from the list itt.remove(); // check whether the handshake has been finished successfully - if ( hst.getState() ) + if ( hst.hasHandshakeFinishedSucessfully() ) { // return the Transport instance to the caller SSLTransport trans = new SSLTransport( hst.getSocket(), @@ -471,13 +471,13 @@ { private SSLSocket m_socket; private SSLAssociation m_association; - private boolean m_state; + private boolean m_handshakeCompletedSuccessfully; public SSLHandshakeThread( SSLSocket sock, SSLAssociation assoc ) { m_socket = sock; m_association = assoc; - m_state = false; + m_handshakeCompletedSuccessfully = false; m_socket.addHandshakeCompletedListener( m_association.getHandshakeCompletedListener() ); } @@ -492,9 +492,9 @@ return m_association; } - public boolean getState() + public boolean hasHandshakeFinishedSucessfully() { - return m_state; + return m_handshakeCompletedSuccessfully; } public void run() @@ -502,7 +502,7 @@ try { m_socket.startHandshake(); - m_state = true; + m_handshakeCompletedSuccessfully = true; } catch ( java.io.IOException ex ) { @@ -517,7 +517,7 @@ getLogger().error( "IOException closing socket: " + ex ); } - m_state = false; + m_handshakeCompletedSuccessfully = false; } } } |
|
From: <lk...@us...> - 2004-11-19 22:43:21
|
Update of /cvsroot/openorb/SSL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27627 Modified Files: WHATSNEW Log Message: renamed method getState() in subclasses of Thread to allow compilation on JDK 1.5 Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/SSL/WHATSNEW,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- WHATSNEW 29 Jul 2004 09:48:13 -0000 1.40 +++ WHATSNEW 19 Nov 2004 22:43:05 -0000 1.41 @@ -1,6 +1,9 @@ OpenORB SSL ----------- +- renamed method getState() in subclasses of Thread to + allow compilation on JDK 1.5 + Version 1.4.0 BETA2 - July, 29 2004 - SSL_1_4_0_BETA2 - Upgraded to checkstyle 3.3. |
|
From: <lk...@us...> - 2004-11-19 22:43:20
|
Update of /cvsroot/openorb/SSL/src/main/org/openorb/orb/csiv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27627/src/main/org/openorb/orb/csiv2 Modified Files: CSITransportServerInitializer.java Log Message: renamed method getState() in subclasses of Thread to allow compilation on JDK 1.5 Index: CSITransportServerInitializer.java =================================================================== RCS file: /cvsroot/openorb/SSL/src/main/org/openorb/orb/csiv2/CSITransportServerInitializer.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- CSITransportServerInitializer.java 19 Feb 2004 06:35:36 -0000 1.13 +++ CSITransportServerInitializer.java 19 Nov 2004 22:43:04 -0000 1.14 @@ -410,7 +410,7 @@ // remove the thread from the list itt.remove(); // check whether the handshake has been finished successfully - if ( hst.getState() ) + if ( hst.hasHandshakeCompletedSuccessfully() ) { // return the Transport instance to the caller SSLTransport trans = new SSLTransport( hst.getSocket(), @@ -515,13 +515,13 @@ { private SSLSocket m_socket; private SSLAssociation m_association; - private boolean m_state; + private boolean m_handshakeCompletedSuccessfully; public SSLHandshakeThread( SSLSocket sock, SSLAssociation assoc ) { m_socket = sock; m_association = assoc; - m_state = false; + m_handshakeCompletedSuccessfully = false; m_socket.addHandshakeCompletedListener( m_association.getHandshakeCompletedListener() ); } @@ -536,9 +536,9 @@ return m_association; } - public boolean getState() + public boolean hasHandshakeCompletedSuccessfully() { - return m_state; + return m_handshakeCompletedSuccessfully; } public void run() @@ -546,7 +546,7 @@ try { m_socket.startHandshake(); - m_state = true; + m_handshakeCompletedSuccessfully = true; } catch ( java.io.IOException ex ) { @@ -561,7 +561,7 @@ getLogger().error( "IOException closing socket: " + ex ); } - m_state = false; + m_handshakeCompletedSuccessfully = false; } } } |
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26843/src/main/org/openorb/pss/connector/database Modified Files: DatabaseSession.java DatabaseWrapper.java FlushManager.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: DatabaseSession.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database/DatabaseSession.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- DatabaseSession.java 10 Aug 2004 19:00:05 -0000 1.12 +++ DatabaseSession.java 19 Nov 2004 22:40:26 -0000 1.13 @@ -179,18 +179,18 @@ // public synchronized void flush() { - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.connector.database.DatabaseEntry entry = null; if ( _cache.size() != 0 ) { org.openorb.pss.util.debug.print( "Flush data into the database..." ); - enum = _cache.elements(); + enumeration = _cache.elements(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - entry = ( org.openorb.pss.connector.database.DatabaseEntry ) enum.nextElement(); + entry = ( org.openorb.pss.connector.database.DatabaseEntry ) enumeration.nextElement(); write_entry_into_database( entry ); } @@ -204,14 +204,14 @@ // public synchronized void refresh() { - java.util.Enumeration enum = _home_from_pid.elements(); + java.util.Enumeration enumeration = _home_from_pid.elements(); org.openorb.pss.connector.database.PersistentObjectHome home = null; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { _cache.clear(); - home = ( org.openorb.pss.connector.database.PersistentObjectHome ) enum.nextElement(); + home = ( org.openorb.pss.connector.database.PersistentObjectHome ) enumeration.nextElement(); home.refreshAll(); } Index: DatabaseWrapper.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database/DatabaseWrapper.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- DatabaseWrapper.java 10 Feb 2004 21:19:15 -0000 1.11 +++ DatabaseWrapper.java 19 Nov 2004 22:40:26 -0000 1.12 @@ -863,7 +863,6 @@ public void map_storagehome( java.io.File into, org.openorb.pss.compiler.reflect.psdlStorageHome sh ) { java.io.PrintWriter file = org.openorb.compiler.idl.util.tools.createNewFile( into, sh.idlName() ); - java.util.Enumeration enum = null; org.openorb.pss.compiler.reflect.psdlStorageType st = sh.homeFor(); org.openorb.pss.compiler.reflect.psdlAbstractStorageType [] ast = null; org.openorb.pss.compiler.reflect.psdlState state = null; @@ -1383,7 +1382,7 @@ private void map_factories( org.openorb.pss.compiler.reflect.psdlStorageHome sh, java.io.PrintWriter file ) { org.openorb.pss.compiler.reflect.psdlFactory [] factories = mappable_factories( sh ); - java.util.Enumeration enum = null; + java.util.Enumeration psdlStates = null; org.openorb.pss.compiler.reflect.psdlState state = null; if ( factories.length != 0 ) @@ -1393,16 +1392,17 @@ { file.print( " public " ); - org.openorb.pss.compiler.util.tools.javaType( m_pcp, ( ( org.openorb.pss.compiler.reflect.psdlAbstractStorageHome ) factories[ i ].idlDefinedIn() ).managed(), file ); + org.openorb.pss.compiler.util.tools.javaType( m_pcp, + ( ( org.openorb.pss.compiler.reflect.psdlAbstractStorageHome ) factories[ i ].idlDefinedIn() ).managed(), file ); file.print( " " + factories[ i ].idlName() + "( " ); boolean first = true; - enum = factories[ i ].content(); + psdlStates = factories[ i ].content(); - while ( enum.hasMoreElements() ) + while ( psdlStates.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) psdlStates.nextElement(); if ( !first ) file.print( ", " ); @@ -1430,11 +1430,11 @@ file.println( " register_type_incarnation( obj );" ); - enum = factories[ i ].content(); + psdlStates = factories[ i ].content(); - while ( enum.hasMoreElements() ) + while ( psdlStates.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) psdlStates.nextElement(); file.println( " obj." + state.idlName() + "( " + state.idlName() + " );" ); } @@ -1541,7 +1541,7 @@ private void map_keys( org.openorb.pss.compiler.reflect.psdlStorageHome sh, java.io.PrintWriter file ) { org.openorb.pss.compiler.reflect.psdlKey [] keys = mappable_keys( sh ); - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.compiler.reflect.psdlState state = null; if ( keys.length != 0 ) @@ -1555,17 +1555,17 @@ file.print( " find_by_" + keys[ i ].idlName() + "( " ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); org.openorb.pss.compiler.util.tools.javaType( m_pcp, state.stateType(), file ); file.print( " " + state.idlName() ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( ", " ); } @@ -1574,22 +1574,22 @@ file.println( " {" ); int k_size = 0; - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { k_size++; - enum.nextElement(); + enumeration.nextElement(); } file.println( " org.openorb.pss.connector.database.KeyBag [] keys = org.openorb.pss.connector.database.DatabaseUtil.keys(" + k_size + ");" ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); int j = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.println( " keys[" + j + "].name = \"" + state.idlName() + "\";" ); @@ -1626,17 +1626,17 @@ file.print( "Ref find_ref_by_" + keys[ i ].idlName() + "( " ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); org.openorb.pss.compiler.util.tools.javaType( m_pcp, state.stateType(), file ); file.print( " " + state.idlName() ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( ", " ); } @@ -1645,12 +1645,12 @@ file.println( " org.openorb.pss.connector.database.KeyBag [] keys = org.openorb.pss.connector.database.DatabaseUtil.keys(" + k_size + ");" ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); j = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.println( " keys[" + j + "].name = \"" + state.idlName() + "\";" ); @@ -1762,15 +1762,15 @@ file.print( " if ( " ); - java.util.Enumeration enum = key.content(); + java.util.Enumeration psdlStates = key.content(); - while ( enum.hasMoreElements() ) + while ( psdlStates.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) psdlStates.nextElement(); file.print( " ( " + map_condition( state.stateType(), "_tmp_" + state.idlName(), state.idlName() ) + " ) " ); - if ( enum.hasMoreElements() ) + if ( psdlStates.hasMoreElements() ) file.print( "&& " ); } @@ -1783,7 +1783,7 @@ private String map_condition( org.openorb.compiler.idl.reflect.idlObject item, String tmp_name, String state_name ) { String condition = ""; - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; switch ( item.idlType() ) { @@ -1800,28 +1800,35 @@ case idlType.STRUCT : org.openorb.compiler.idl.reflect.idlStruct st = ( org.openorb.compiler.idl.reflect.idlStruct ) item; - enum = st.members(); + enumeration = st.members(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - org.openorb.compiler.idl.reflect.idlStructMember member = ( org.openorb.compiler.idl.reflect.idlStructMember ) enum.nextElement(); + org.openorb.compiler.idl.reflect.idlStructMember member = + ( org.openorb.compiler.idl.reflect.idlStructMember ) enumeration.nextElement(); - condition = condition + "(" + map_condition( member.internal(), tmp_name + "." + member.idlName(), state_name + "." + member.idlName() ) + " )"; + condition = condition + "(" + + map_condition( member.internal(), + tmp_name + "." + member.idlName(), + state_name + "." + member.idlName() ) + + " )"; - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) + { condition = condition + " && "; + } } return condition; case idlType.VALUE : org.openorb.compiler.idl.reflect.idlValue val = ( org.openorb.compiler.idl.reflect.idlValue ) item; - enum = val.filter( org.openorb.compiler.idl.reflect.idlType.STATE ); + enumeration = val.filter( org.openorb.compiler.idl.reflect.idlType.STATE ); boolean first = true; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - org.openorb.compiler.idl.reflect.idlState state = ( org.openorb.compiler.idl.reflect.idlState ) enum.nextElement(); + org.openorb.compiler.idl.reflect.idlState state = ( org.openorb.compiler.idl.reflect.idlState ) enumeration.nextElement(); if ( state.isPublic() ) { Index: FlushManager.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/database/FlushManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- FlushManager.java 10 Feb 2004 21:19:15 -0000 1.6 +++ FlushManager.java 19 Nov 2004 22:40:26 -0000 1.7 @@ -49,11 +49,11 @@ { org.openorb.pss.connector.database.DatabaseCatalog manager = null; - java.util.Enumeration enum = manager_list.elements(); + java.util.Enumeration enumeration = manager_list.elements(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - manager = ( org.openorb.pss.connector.database.DatabaseCatalog ) enum.nextElement(); + manager = ( org.openorb.pss.connector.database.DatabaseCatalog ) enumeration.nextElement(); manager.flush(); } |
|
From: <lk...@us...> - 2004-11-19 22:41:06
|
Update of /cvsroot/openorb/PersistentStateService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26843 Modified Files: WHATSNEW Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/WHATSNEW,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- WHATSNEW 16 Nov 2004 09:04:23 -0000 1.41 +++ WHATSNEW 19 Nov 2004 22:40:25 -0000 1.42 @@ -1,6 +1,8 @@ OpenORB PersistentStateService ------------------------------ +- Renamed "enum" variables to allow compilation on JDK 1.5 + - Fixed ArrayIndexOutOfBoundsException in MemoryIterator.detach() - After an SQL Exception the DB Connection is now tested by executing |
|
From: <lk...@us...> - 2004-11-19 22:41:06
|
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/compiler/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26843/src/main/org/openorb/pss/compiler/util Modified Files: tools.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: tools.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/compiler/util/tools.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- tools.java 10 Feb 2004 21:19:15 -0000 1.8 +++ tools.java 19 Nov 2004 22:40:25 -0000 1.9 @@ -484,11 +484,11 @@ { org.openorb.compiler.idl.reflect.idlObject obj = ( org.openorb.compiler.idl.reflect.idlObject ) ob; - java.util.Enumeration enum = obj.filter( org.openorb.pss.compiler.reflect.psdlType.STORE ); + java.util.Enumeration stores = obj.filter( org.openorb.pss.compiler.reflect.psdlType.STORE ); - while ( enum.hasMoreElements() ) + while ( stores.hasMoreElements() ) { - org.openorb.pss.compiler.reflect.psdlStore store = ( org.openorb.pss.compiler.reflect.psdlStore ) enum.nextElement(); + org.openorb.pss.compiler.reflect.psdlStore store = ( org.openorb.pss.compiler.reflect.psdlStore ) stores.nextElement(); if ( store.state().idlName().equals( state.idlName() ) ) return store; |
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/memory In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26843/src/main/org/openorb/pss/connector/memory Modified Files: MemoryCatalog.java MemorySession.java MemoryWrapper.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: MemoryCatalog.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/memory/MemoryCatalog.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- MemoryCatalog.java 10 Feb 2004 21:19:16 -0000 1.6 +++ MemoryCatalog.java 19 Nov 2004 22:40:29 -0000 1.7 @@ -144,7 +144,7 @@ public java.lang.Object find_by_pid( byte[] the_pid ) throws org.omg.CosPersistentState.NotFound { - java.util.Enumeration enum = _home_incarnations.elements(); + java.util.Enumeration enumeration = _home_incarnations.elements(); org.openorb.pss.connector.memory.PersistentObjectHome object_home = null; @@ -154,9 +154,9 @@ byte [] short_pid = org.openorb.pss.connector.memory.PIDFactory.pid_to_short_pid( the_pid ); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - object_home = ( org.openorb.pss.connector.memory.PersistentObjectHome ) enum.nextElement(); + object_home = ( org.openorb.pss.connector.memory.PersistentObjectHome ) enumeration.nextElement(); org.openorb.pss.connector.PID home_pid = object_home.getPID(); @@ -182,7 +182,7 @@ public org.omg.CosPersistentState.StorageObjectRef find_ref_by_pid( byte [] the_pid ) throws org.omg.CosPersistentState.NotFound { - java.util.Enumeration enum = _home_incarnations.elements(); + java.util.Enumeration enumeration = _home_incarnations.elements(); org.openorb.pss.connector.memory.PersistentObjectHome object_home = null; @@ -192,9 +192,9 @@ byte [] short_pid = org.openorb.pss.connector.memory.PIDFactory.pid_to_short_pid( the_pid ); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - object_home = ( org.openorb.pss.connector.memory.PersistentObjectHome ) enum.nextElement(); + object_home = ( org.openorb.pss.connector.memory.PersistentObjectHome ) enumeration.nextElement(); org.openorb.pss.connector.PID home_pid = object_home.getPID(); Index: MemorySession.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/memory/MemorySession.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- MemorySession.java 10 Feb 2004 21:19:16 -0000 1.8 +++ MemorySession.java 19 Nov 2004 22:40:29 -0000 1.9 @@ -202,11 +202,11 @@ public org.omg.CosPersistentState.StorageHomeBase find_home_base( org.openorb.pss.connector.PID pid ) { org.openorb.pss.connector.PID p = null; - java.util.Enumeration enum = _home_incarnations.keys(); + java.util.Enumeration enumeration = _home_incarnations.keys(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - p = ( org.openorb.pss.connector.PID ) enum.nextElement(); + p = ( org.openorb.pss.connector.PID ) enumeration.nextElement(); if ( p.is_same_catalog( pid.catalog_value() ) ) { Index: MemoryWrapper.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/memory/MemoryWrapper.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- MemoryWrapper.java 10 Feb 2004 21:19:16 -0000 1.10 +++ MemoryWrapper.java 19 Nov 2004 22:40:29 -0000 1.11 @@ -768,9 +768,7 @@ public void map_storagehome( java.io.File into, org.openorb.pss.compiler.reflect.psdlStorageHome sh ) { java.io.PrintWriter file = org.openorb.compiler.idl.util.tools.createNewFile( into, sh.idlName() ); - java.util.Enumeration enum = null; org.openorb.pss.compiler.reflect.psdlStorageType st = sh.homeFor(); - org.openorb.pss.compiler.reflect.psdlState state = null; // File header @@ -1178,7 +1176,7 @@ private void map_factories( org.openorb.pss.compiler.reflect.psdlStorageHome sh, java.io.PrintWriter file ) { org.openorb.pss.compiler.reflect.psdlFactory [] factories = mappable_factories( sh ); - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.compiler.reflect.psdlState state = null; if ( factories.length != 0 ) @@ -1193,11 +1191,11 @@ file.print( " " + factories[ i ].idlName() + "( " ); boolean first = true; - enum = factories[ i ].content(); + enumeration = factories[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); if ( !first ) file.print( ", " ); @@ -1225,11 +1223,11 @@ file.println( " register_type_incarnation( obj );" ); - enum = factories[ i ].content(); + enumeration = factories[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.println( " obj." + state.idlName() + "( " + state.idlName() + " );" ); } @@ -1336,7 +1334,7 @@ private void map_keys( org.openorb.pss.compiler.reflect.psdlStorageHome sh, java.io.PrintWriter file ) { org.openorb.pss.compiler.reflect.psdlKey [] keys = mappable_keys( sh ); - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.compiler.reflect.psdlState state = null; if ( keys.length != 0 ) @@ -1350,17 +1348,17 @@ file.print( " find_by_" + keys[ i ].idlName() + "( " ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); tools.javaType( m_pcp, state.stateType(), file ); file.print( " " + state.idlName() ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( ", " ); } @@ -1379,11 +1377,11 @@ tools.javaType( m_pcp, ( ( org.openorb.pss.compiler.reflect.psdlAbstractStorageHome ) keys[ i ].idlDefinedIn() ).managed(), file ); file.println( " ) it.next();" ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.print( " " ); tools.javaType( m_pcp, state.stateType(), file ); @@ -1412,17 +1410,17 @@ file.print( "Ref find_ref_by_" + keys[ i ].idlName() + "( " ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); tools.javaType( m_pcp, state.stateType(), file ); file.print( " " + state.idlName() ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( ", " ); } @@ -1440,11 +1438,11 @@ tools.javaType( m_pcp, ( ( org.openorb.pss.compiler.reflect.psdlAbstractStorageHome ) keys[ i ].idlDefinedIn() ).managed(), file ); file.println( " ) it.next();" ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.print( " " ); tools.javaType( m_pcp, state.stateType(), file ); @@ -1548,15 +1546,15 @@ file.print( " if ( " ); - java.util.Enumeration enum = key.content(); + java.util.Enumeration enumeration = key.content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.print( " ( " + map_condition( state.stateType(), "_tmp_" + state.idlName(), state.idlName() ) + " ) " ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( "&& " ); } @@ -1569,7 +1567,7 @@ private String map_condition( org.openorb.compiler.idl.reflect.idlObject item, String tmp_name, String state_name ) { String condition = ""; - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; switch ( item.idlType() ) { @@ -1586,15 +1584,15 @@ case idlType.STRUCT : org.openorb.compiler.idl.reflect.idlStruct st = ( org.openorb.compiler.idl.reflect.idlStruct ) item; - enum = st.members(); + enumeration = st.members(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - org.openorb.compiler.idl.reflect.idlStructMember member = ( org.openorb.compiler.idl.reflect.idlStructMember ) enum.nextElement(); + org.openorb.compiler.idl.reflect.idlStructMember member = ( org.openorb.compiler.idl.reflect.idlStructMember ) enumeration.nextElement(); condition = condition + "(" + map_condition( member.internal(), tmp_name + "." + member.idlName(), state_name + "." + member.idlName() ) + " )"; - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) condition = condition + " && "; } @@ -1602,12 +1600,12 @@ case idlType.VALUE : org.openorb.compiler.idl.reflect.idlValue val = ( org.openorb.compiler.idl.reflect.idlValue ) item; - enum = val.filter( org.openorb.compiler.idl.reflect.idlType.STATE ); + enumeration = val.filter( org.openorb.compiler.idl.reflect.idlType.STATE ); boolean first = true; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - org.openorb.compiler.idl.reflect.idlState state = ( org.openorb.compiler.idl.reflect.idlState ) enum.nextElement(); + org.openorb.compiler.idl.reflect.idlState state = ( org.openorb.compiler.idl.reflect.idlState ) enumeration.nextElement(); if ( state.isPublic() ) { |
|
From: <lk...@us...> - 2004-11-19 22:40:41
|
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26843/src/main/org/openorb/pss/connector/file Modified Files: DataManager.java FileCatalog.java FileSession.java FileWrapper.java FlushManager.java TransactionalDataManager.java TransactionalFileSession.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: DataManager.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/DataManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- DataManager.java 10 Feb 2004 21:53:58 -0000 1.7 +++ DataManager.java 19 Nov 2004 22:40:28 -0000 1.8 @@ -238,18 +238,18 @@ public void flush() { - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.connector.file.DataEntry entry = null; if ( ( _cache.size() != 0 ) && ( _lock_flush == false ) ) { org.openorb.pss.util.debug.print( "Flush all information saved into the cache... [ " + _home_name + " ]" ); - enum = _cache.elements(); + enumeration = _cache.elements(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - entry = ( org.openorb.pss.connector.file.DataEntry ) enum.nextElement(); + entry = ( org.openorb.pss.connector.file.DataEntry ) enumeration.nextElement(); if ( entry.valid ) write_entry_into_datastore( entry ); @@ -274,13 +274,13 @@ _cache.clear(); // 2. Invalidate all entries - java.util.Enumeration enum = _index_table.elements(); + java.util.Enumeration enumeration = _index_table.elements(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { try { - Long index = ( Long ) enum.nextElement(); + Long index = ( Long ) enumeration.nextElement(); if ( index == null ) return; Index: FileCatalog.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/FileCatalog.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- FileCatalog.java 10 Feb 2004 21:19:16 -0000 1.6 +++ FileCatalog.java 19 Nov 2004 22:40:28 -0000 1.7 @@ -135,7 +135,7 @@ throws org.omg.CosPersistentState.NotFound { - java.util.Enumeration enum = _home_incarnations.elements(); + java.util.Enumeration enumeration = _home_incarnations.elements(); org.openorb.pss.connector.file.PersistentObjectHome object_home = null; @@ -145,9 +145,9 @@ byte [] short_pid = org.openorb.pss.connector.file.PIDFactory.pid_to_short_pid( the_pid ); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - object_home = ( org.openorb.pss.connector.file.PersistentObjectHome ) enum.nextElement(); + object_home = ( org.openorb.pss.connector.file.PersistentObjectHome ) enumeration.nextElement(); org.openorb.pss.connector.PID home_pid = object_home.getPID(); @@ -173,19 +173,17 @@ public org.omg.CosPersistentState.StorageObjectRef find_ref_by_pid( byte [] the_pid ) throws org.omg.CosPersistentState.NotFound { - java.util.Enumeration enum = _home_incarnations.elements(); + java.util.Enumeration enumeration = _home_incarnations.elements(); org.openorb.pss.connector.file.PersistentObjectHome object_home = null; - org.omg.CosPersistentState.StorageHomeBase home = null; - byte [] catalog_pid = org.openorb.pss.connector.file.PIDFactory.pid_to_catalog_pid( the_pid, _info ); byte [] short_pid = org.openorb.pss.connector.file.PIDFactory.pid_to_short_pid( the_pid ); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - object_home = ( org.openorb.pss.connector.file.PersistentObjectHome ) enum.nextElement(); + object_home = ( org.openorb.pss.connector.file.PersistentObjectHome ) enumeration.nextElement(); org.openorb.pss.connector.PID home_pid = object_home.getPID(); @@ -205,14 +203,14 @@ { org.openorb.pss.connector.PID home_pid = ( ( org.openorb.pss.connector.file.PersistentObjectHome ) home ).getPID(); - java.util.Enumeration enum = getSequentialAccess( home_pid ); + java.util.Enumeration enumeration = getSequentialAccess( home_pid ); java.util.Vector list = new java.util.Vector(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { list.addElement( PIDFactory.short_pid_to_pid( - ( ( org.openorb.pss.connector.file.FileKeyBag ) enum.nextElement() ).short_pid, + ( ( org.openorb.pss.connector.file.FileKeyBag ) enumeration.nextElement() ).short_pid, home_pid ) ); } Index: FileSession.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/FileSession.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- FileSession.java 10 Feb 2004 21:19:16 -0000 1.10 +++ FileSession.java 19 Nov 2004 22:40:28 -0000 1.11 @@ -254,7 +254,8 @@ new_entry.valid = true; new_entry.short_pid = type_pid.short_value(); - org.openorb.orb.io.StorageBuffer buffer = ( ( org.openorb.orb.io.MarshalBuffer ) ( ( org.openorb.orb.iiop.CDROutputStream ) output ).getMarshalBuffer() ).lastFragment(); + org.openorb.orb.io.StorageBuffer buffer = + ( ( ( org.openorb.orb.iiop.CDROutputStream ) output ).getMarshalBuffer() ).lastFragment(); new_entry.data = buffer.linearize(); // Verify if another entry exists with the same PID and if so, deleted it @@ -329,11 +330,11 @@ // public synchronized void flush() { - java.util.Enumeration enum = _home_datastores.elements(); + java.util.Enumeration enumeration = _home_datastores.elements(); DataManager manager = null; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - manager = ( DataManager ) enum.nextElement(); + manager = ( DataManager ) enumeration.nextElement(); manager.flush(); } } @@ -343,11 +344,11 @@ // public synchronized void refresh() { - java.util.Enumeration enum = _home_incarnations.elements(); + java.util.Enumeration enumeration = _home_incarnations.elements(); PersistentObjectHome home = null; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - home = ( PersistentObjectHome ) enum.nextElement(); + home = ( PersistentObjectHome ) enumeration.nextElement(); home.refreshAll(); } } @@ -357,11 +358,11 @@ // public synchronized void free_all() { - java.util.Enumeration enum = _home_datastores.elements(); + java.util.Enumeration enumeration = _home_datastores.elements(); DataManager manager = null; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - manager = ( DataManager ) enum.nextElement(); + manager = ( DataManager ) enumeration.nextElement(); manager.free_all(); } } @@ -371,11 +372,11 @@ // public synchronized void close() { - java.util.Enumeration enum = _home_datastores.elements(); + java.util.Enumeration enumeration = _home_datastores.elements(); DataManager manager = null; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - manager = ( DataManager ) enum.nextElement(); + manager = ( DataManager ) enumeration.nextElement(); manager.close(); } if ( ! manager.shared() ) _datastores.remove( manager.key() ); @@ -512,11 +513,11 @@ public org.omg.CosPersistentState.StorageHomeBase find_home_base( PID pid ) { PID p = null; - java.util.Enumeration enum = _home_datastores.keys(); + java.util.Enumeration enumeration = _home_datastores.keys(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - p = ( PID ) enum.nextElement(); + p = ( PID ) enumeration.nextElement(); if ( p.is_same_catalog( pid.catalog_value() ) ) { DataManager mgr = ( DataManager ) _home_datastores.get( p ); Index: FileWrapper.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/FileWrapper.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- FileWrapper.java 10 Feb 2004 21:19:16 -0000 1.11 +++ FileWrapper.java 19 Nov 2004 22:40:28 -0000 1.12 @@ -867,9 +867,7 @@ public void map_storagehome( java.io.File into, org.openorb.pss.compiler.reflect.psdlStorageHome sh ) { java.io.PrintWriter file = org.openorb.compiler.idl.util.tools.createNewFile( into, sh.idlName() ); - java.util.Enumeration enum = null; org.openorb.pss.compiler.reflect.psdlStorageType st = sh.homeFor(); - org.openorb.pss.compiler.reflect.psdlState state = null; // File header @@ -1344,7 +1342,7 @@ private void map_factories( org.openorb.pss.compiler.reflect.psdlStorageHome sh, java.io.PrintWriter file ) { org.openorb.pss.compiler.reflect.psdlFactory [] factories = mappable_factories( sh ); - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.compiler.reflect.psdlState state = null; if ( factories.length != 0 ) @@ -1359,11 +1357,11 @@ file.print( " " + factories[ i ].idlName() + "( " ); boolean first = true; - enum = factories[ i ].content(); + enumeration = factories[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); if ( !first ) file.print( ", " ); @@ -1391,11 +1389,11 @@ file.println( " register_type_incarnation( obj );" ); - enum = factories[ i ].content(); + enumeration = factories[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.println( " obj." + state.idlName() + "( " + state.idlName() + " );" ); } @@ -1502,7 +1500,7 @@ private void map_keys( org.openorb.pss.compiler.reflect.psdlStorageHome sh, java.io.PrintWriter file ) { org.openorb.pss.compiler.reflect.psdlKey [] keys = mappable_keys( sh ); - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; org.openorb.pss.compiler.reflect.psdlState state = null; if ( keys.length != 0 ) @@ -1516,17 +1514,17 @@ file.print( " find_by_" + keys[ i ].idlName() + "( " ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); tools.javaType( m_pcp, state.stateType(), file ); file.print( " " + state.idlName() ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( ", " ); } @@ -1599,17 +1597,17 @@ file.print( "Ref find_ref_by_" + keys[ i ].idlName() + "( " ); - enum = keys[ i ].content(); + enumeration = keys[ i ].content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); tools.javaType( m_pcp, state.stateType(), file ); file.print( " " + state.idlName() ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( ", " ); } @@ -1761,15 +1759,15 @@ file.print( " if ( " ); - java.util.Enumeration enum = key.content(); + java.util.Enumeration enumeration = key.content(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - state = ( org.openorb.pss.compiler.reflect.psdlState ) enum.nextElement(); + state = ( org.openorb.pss.compiler.reflect.psdlState ) enumeration.nextElement(); file.print( " ( " + map_condition( state.stateType(), "_tmp_" + state.idlName(), state.idlName() ) + " ) " ); - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) file.print( "&& " ); } @@ -1782,7 +1780,7 @@ private String map_condition( org.openorb.compiler.idl.reflect.idlObject item, String tmp_name, String state_name ) { String condition = ""; - java.util.Enumeration enum = null; + java.util.Enumeration enumeration = null; switch ( item.idlType() ) { @@ -1799,15 +1797,15 @@ case idlType.STRUCT : org.openorb.compiler.idl.reflect.idlStruct st = ( org.openorb.compiler.idl.reflect.idlStruct ) item; - enum = st.members(); + enumeration = st.members(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - org.openorb.compiler.idl.reflect.idlStructMember member = ( org.openorb.compiler.idl.reflect.idlStructMember ) enum.nextElement(); + org.openorb.compiler.idl.reflect.idlStructMember member = ( org.openorb.compiler.idl.reflect.idlStructMember ) enumeration.nextElement(); condition = condition + "(" + map_condition( member.internal(), tmp_name + "." + member.idlName(), state_name + "." + member.idlName() ) + " )"; - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) condition = condition + " && "; } @@ -1815,12 +1813,12 @@ case idlType.VALUE : org.openorb.compiler.idl.reflect.idlValue val = ( org.openorb.compiler.idl.reflect.idlValue ) item; - enum = val.filter( org.openorb.compiler.idl.reflect.idlType.STATE ); + enumeration = val.filter( org.openorb.compiler.idl.reflect.idlType.STATE ); boolean first = true; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - org.openorb.compiler.idl.reflect.idlState state = ( org.openorb.compiler.idl.reflect.idlState ) enum.nextElement(); + org.openorb.compiler.idl.reflect.idlState state = ( org.openorb.compiler.idl.reflect.idlState ) enumeration.nextElement(); if ( state.isPublic() ) { Index: FlushManager.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/FlushManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- FlushManager.java 10 Feb 2004 21:19:16 -0000 1.6 +++ FlushManager.java 19 Nov 2004 22:40:29 -0000 1.7 @@ -49,11 +49,11 @@ { org.openorb.pss.connector.file.DataManager manager = null; - java.util.Enumeration enum = manager_list.elements(); + java.util.Enumeration enumeration = manager_list.elements(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - manager = ( org.openorb.pss.connector.file.DataManager ) enum.nextElement(); + manager = ( org.openorb.pss.connector.file.DataManager ) enumeration.nextElement(); manager.flush(); } Index: TransactionalDataManager.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/TransactionalDataManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TransactionalDataManager.java 10 Feb 2004 21:19:16 -0000 1.5 +++ TransactionalDataManager.java 19 Nov 2004 22:40:29 -0000 1.6 @@ -122,15 +122,15 @@ private synchronized void apply_modification() { - java.util.Enumeration enum = _modified.keys(); + java.util.Enumeration enumeration = _modified.keys(); String key = null; org.openorb.pss.connector.PID pid = null; org.openorb.pss.connector.file.DataEntry entry = null; java.util.Hashtable table = get_index_table(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - key = ( String ) enum.nextElement(); + key = ( String ) enumeration.nextElement(); if ( _modified.get( key ) instanceof org.openorb.pss.connector.PID ) { Index: TransactionalFileSession.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/file/TransactionalFileSession.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TransactionalFileSession.java 10 Feb 2004 21:19:16 -0000 1.6 +++ TransactionalFileSession.java 19 Nov 2004 22:40:29 -0000 1.7 @@ -276,11 +276,11 @@ catch ( java.lang.Exception ex ) { } - java.util.Enumeration enum = _home_datastores.elements(); + java.util.Enumeration enumeration = _home_datastores.elements(); org.openorb.pss.connector.file.TransactionalDataManager manager = null; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - manager = ( org.openorb.pss.connector.file.TransactionalDataManager ) enum.nextElement(); + manager = ( org.openorb.pss.connector.file.TransactionalDataManager ) enumeration.nextElement(); if ( !manager.begun() ) manager.begin(); } } @@ -291,12 +291,12 @@ public org.openorb.pss.connector.file.TransactionalDataManager [] get_data_managers() { org.openorb.pss.connector.file.TransactionalDataManager [] managers = new org.openorb.pss.connector.file.TransactionalDataManager[ _home_datastores.size() ]; - java.util.Enumeration enum = _home_datastores.elements(); + java.util.Enumeration enumeration = _home_datastores.elements(); int i = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - managers[ i++ ] = ( org.openorb.pss.connector.file.TransactionalDataManager ) enum.nextElement(); + managers[ i++ ] = ( org.openorb.pss.connector.file.TransactionalDataManager ) enumeration.nextElement(); } return managers; |
|
From: <lk...@us...> - 2004-11-19 22:38:20
|
Update of /cvsroot/openorb/ConcurrencyControlService/src/main/org/openorb/ccs/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26360/src/main/org/openorb/ccs/kernel Modified Files: LockCoordinator.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: LockCoordinator.java =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/src/main/org/openorb/ccs/kernel/LockCoordinator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- LockCoordinator.java 22 Aug 2002 14:58:48 -0000 1.5 +++ LockCoordinator.java 19 Nov 2004 22:38:00 -0000 1.6 @@ -42,10 +42,10 @@ */ public void drop_locks() { - for ( Enumeration enum = m_transactionalLockSets.elements(); enum.hasMoreElements(); ) + for ( Enumeration enumeration = m_transactionalLockSets.elements(); enumeration.hasMoreElements(); ) { org.openorb.ccs.kernel.TransactionalLockSet t_lockSet = - ( org.openorb.ccs.kernel.TransactionalLockSet ) enum.nextElement(); + ( org.openorb.ccs.kernel.TransactionalLockSet ) enumeration.nextElement(); t_lockSet.unlockAll( m_coordinator ); } m_transactionalLockSets = new Vector(); |
|
From: <lk...@us...> - 2004-11-19 22:38:20
|
Update of /cvsroot/openorb/ConcurrencyControlService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26360 Modified Files: WHATSNEW Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/WHATSNEW,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- WHATSNEW 29 Jul 2004 09:48:11 -0000 1.25 +++ WHATSNEW 19 Nov 2004 22:38:00 -0000 1.26 @@ -1,6 +1,8 @@ OpenORB ConcurrencyControlService --------------------------------- +- Renamed "enum" variables to allow compilation on JDK 1.5 + Version 1.4.0 BETA2 - July, 29 2004 - ConcurrencyControlService_1_4_0_BETA2 - Upgraded to checkstyle 3.3. |
|
From: <lk...@us...> - 2004-11-19 22:38:17
|
Update of /cvsroot/openorb/ConcurrencyControlService/src/examples/org/openorb/ccs/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26360/src/examples/org/openorb/ccs/examples Modified Files: CCSClient.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: CCSClient.java =================================================================== RCS file: /cvsroot/openorb/ConcurrencyControlService/src/examples/org/openorb/ccs/examples/CCSClient.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- CCSClient.java 10 Feb 2004 21:39:50 -0000 1.9 +++ CCSClient.java 19 Nov 2004 22:38:00 -0000 1.10 @@ -442,9 +442,9 @@ */ public void dispose() { - for ( Enumeration enum = m_resource_lock.keys(); enum.hasMoreElements(); ) + for ( Enumeration enumeration = m_resource_lock.keys(); enumeration.hasMoreElements(); ) { - String resourceName = enum.nextElement().toString(); + String resourceName = enumeration.nextElement().toString(); for ( int i = 0; i < MODES.length; i++ ) { unlock( resourceName, i ); |
|
From: <lk...@us...> - 2004-11-19 22:36:17
|
Update of /cvsroot/openorb/TradingService/src/main/org/openorb/trader/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25869/src/main/org/openorb/trader/kernel Modified Files: Lookup.java Register.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: Lookup.java =================================================================== RCS file: /cvsroot/openorb/TradingService/src/main/org/openorb/trader/kernel/Lookup.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Lookup.java 21 Jul 2004 13:17:33 -0000 1.18 +++ Lookup.java 19 Nov 2004 22:36:04 -0000 1.19 @@ -761,11 +761,11 @@ int i = 0; - java.util.Enumeration enum = sorted.elements(); + java.util.Enumeration enumeration = sorted.elements(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - result[ i++ ] = ( String ) enum.nextElement(); + result[ i++ ] = ( String ) enumeration.nextElement(); } } Index: Register.java =================================================================== RCS file: /cvsroot/openorb/TradingService/src/main/org/openorb/trader/kernel/Register.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Register.java 21 Jul 2004 13:17:34 -0000 1.13 +++ Register.java 19 Nov 2004 22:36:04 -0000 1.14 @@ -287,11 +287,11 @@ tbl.remove( tbl.get( del_list[ i ] ) ); } properties = new org.omg.CosTrading.Property[ tbl.size() ]; - java.util.Enumeration enum = tbl.elements(); + java.util.Enumeration enumeration = tbl.elements(); int j = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - properties[ j++ ] = ( org.omg.CosTrading.Property ) enum.nextElement(); + properties[ j++ ] = ( org.omg.CosTrading.Property ) enumeration.nextElement(); } // -- checks the modify list -- tbl.clear(); |
|
From: <lk...@us...> - 2004-11-19 22:36:17
|
Update of /cvsroot/openorb/TradingService/src/main/org/openorb/trader/repository In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25869/src/main/org/openorb/trader/repository Modified Files: Repository.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: Repository.java =================================================================== RCS file: /cvsroot/openorb/TradingService/src/main/org/openorb/trader/repository/Repository.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Repository.java 26 Jul 2004 12:03:55 -0000 1.13 +++ Repository.java 19 Nov 2004 22:36:04 -0000 1.14 @@ -356,20 +356,20 @@ org.omg.CosTradingRepos.ServiceTypeRepositoryPackage.TypeStruct ret = new org.omg.CosTradingRepos.ServiceTypeRepositoryPackage.TypeStruct(); String [] super_types = new String[ supers.size() ]; - java.util.Enumeration enum = supers.elements(); + java.util.Enumeration enumeration = supers.elements(); int i = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - super_types[ i++ ] = ( String ) enum.nextElement(); + super_types[ i++ ] = ( String ) enumeration.nextElement(); } org.omg.CosTradingRepos.ServiceTypeRepositoryPackage.PropStruct [] props = new PropStruct[ properties.size() ]; - enum = properties.elements(); + enumeration = properties.elements(); i = 0; - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { props[ i++ ] = ( org.omg.CosTradingRepos.ServiceTypeRepositoryPackage.PropStruct ) - enum.nextElement(); + enumeration.nextElement(); } ret.if_name = struct.if_name; ret.props = props; @@ -744,19 +744,19 @@ /** * Checks if the first property mode is strictly more restrictive than the second one. */ - private boolean is_more_restrictive( PropertyMode prop_a, PropertyMode prop_b ) + private boolean is_more_restrictive( PropertyMode prop_a, PropertyMode prop_b ) { - if ( prop_a == PropertyMode.PROP_NORMAL ) + if ( prop_a == PropertyMode.PROP_NORMAL ) { return false; } - if ( prop_a == PropertyMode.PROP_MANDATORY_READONLY - && prop_b != PropertyMode.PROP_MANDATORY_READONLY ) + if ( prop_a == PropertyMode.PROP_MANDATORY_READONLY + && prop_b != PropertyMode.PROP_MANDATORY_READONLY ) { return true; } - if ( ( prop_a == PropertyMode.PROP_MANDATORY || prop_a == PropertyMode.PROP_READONLY ) - && prop_b == PropertyMode.PROP_NORMAL ) + if ( ( prop_a == PropertyMode.PROP_MANDATORY || prop_a == PropertyMode.PROP_READONLY ) + && prop_b == PropertyMode.PROP_NORMAL ) { return true; } |
|
From: <lk...@us...> - 2004-11-19 22:36:17
|
Update of /cvsroot/openorb/TradingService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25869 Modified Files: WHATSNEW Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/TradingService/WHATSNEW,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- WHATSNEW 29 Jul 2004 09:48:13 -0000 1.38 +++ WHATSNEW 19 Nov 2004 22:36:04 -0000 1.39 @@ -1,6 +1,8 @@ OpenORB TradingService ---------------------- +- Renamed "enum" variables to allow compilation on JDK 1.5 + Version 1.4.0 BETA2 - July, 29 2004 - TradingService_1_4_0_BETA2 - Applied patch for bug #799051. It was not possible to |
|
From: <lk...@us...> - 2004-11-19 22:35:29
|
Update of /cvsroot/openorb/PropertyService/src/main/org/openorb/property In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25714/src/main/org/openorb/property Modified Files: PropertySetDefImpl.java PropertySetImpl.java Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: PropertySetDefImpl.java =================================================================== RCS file: /cvsroot/openorb/PropertyService/src/main/org/openorb/property/PropertySetDefImpl.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- PropertySetDefImpl.java 19 Feb 2004 06:35:34 -0000 1.14 +++ PropertySetDefImpl.java 19 Nov 2004 22:35:18 -0000 1.15 @@ -729,23 +729,23 @@ { int available = m_property_table.size(); int length = how_many <= available ? how_many : available; // < 0, if how_many < 0 - java.util.Enumeration enum = m_property_table.keys(); + java.util.Enumeration enumeration = m_property_table.keys(); if ( length >= 0 ) { property_names.value = new java.lang.String[ length ]; for ( int i = 0; i < length; i++ ) { - property_names.value[ i ] = ( java.lang.String ) enum.nextElement(); + property_names.value[ i ] = ( java.lang.String ) enumeration.nextElement(); } } - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) { java.util.Vector theRest = new java.util.Vector(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - theRest.addElement( ( java.lang.String ) enum.nextElement() ); + theRest.addElement( ( java.lang.String ) enumeration.nextElement() ); } java.lang.String[] the_rest = new java.lang.String[ theRest.size() ]; theRest.copyInto( the_rest ); @@ -865,7 +865,7 @@ { int available = m_property_table.size(); int length = how_many <= available ? how_many : available; // < 0, if how_many < 0 - java.util.Enumeration enum = m_property_table.keys(); + java.util.Enumeration enumeration = m_property_table.keys(); if ( length >= 0 ) { @@ -874,20 +874,20 @@ { org.omg.CosPropertyService.PropertyDef property_def = ( org.omg.CosPropertyService.PropertyDef ) - m_property_table.get( ( java.lang.String ) enum.nextElement() ); + m_property_table.get( ( java.lang.String ) enumeration.nextElement() ); nproperties.value[ i ] = new org.omg.CosPropertyService.Property( property_def.property_name, property_def.property_value ); } } - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) { java.util.Vector theRest = new java.util.Vector(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { org.omg.CosPropertyService.PropertyDef property_def = ( org.omg.CosPropertyService.PropertyDef ) - m_property_table.get( ( java.lang.String ) enum.nextElement() ); + m_property_table.get( ( java.lang.String ) enumeration.nextElement() ); theRest.addElement( new org.omg.CosPropertyService.Property( property_def.property_name, property_def.property_value ) ); } @@ -1027,12 +1027,12 @@ */ public boolean delete_all_properties() { - java.util.Enumeration enum = m_property_table.keys(); - for ( ; enum.hasMoreElements(); ) + java.util.Enumeration enumeration = m_property_table.keys(); + for ( ; enumeration.hasMoreElements(); ) { try { - delete_property( ( java.lang.String ) enum.nextElement() ); + delete_property( ( java.lang.String ) enumeration.nextElement() ); } catch ( org.omg.CosPropertyService.PropertyNotFound ex ) { Index: PropertySetImpl.java =================================================================== RCS file: /cvsroot/openorb/PropertyService/src/main/org/openorb/property/PropertySetImpl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- PropertySetImpl.java 19 Feb 2004 06:35:34 -0000 1.11 +++ PropertySetImpl.java 19 Nov 2004 22:35:18 -0000 1.12 @@ -287,23 +287,23 @@ { int available = m_property_table.size(); int length = how_many <= available ? how_many : available; // < 0, if how_many < 0 - java.util.Enumeration enum = m_property_table.keys(); + java.util.Enumeration enumeration = m_property_table.keys(); if ( length >= 0 ) { property_names.value = new java.lang.String[ length ]; for ( int i = 0; i < length; i++ ) { - property_names.value[ i ] = ( java.lang.String ) enum.nextElement(); + property_names.value[ i ] = ( java.lang.String ) enumeration.nextElement(); } } - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) { java.util.Vector propertyTableKeys = new java.util.Vector(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { - propertyTableKeys.addElement( ( java.lang.String ) enum.nextElement() ); + propertyTableKeys.addElement( ( java.lang.String ) enumeration.nextElement() ); } java.lang.String[] the_rest = new java.lang.String[ propertyTableKeys.size() ]; propertyTableKeys.copyInto( the_rest ); @@ -423,7 +423,7 @@ { int available = m_property_table.size(); int length = how_many <= available ? how_many : available; // < 0, if how_many < 0 - java.util.Enumeration enum = m_property_table.keys(); + java.util.Enumeration enumeration = m_property_table.keys(); if ( length >= 0 ) { @@ -431,17 +431,17 @@ for ( int i = 0; i < length; i++ ) { nproperties.value[ i ] = ( org.omg.CosPropertyService.Property ) - m_property_table.get( ( java.lang.String ) enum.nextElement() ); + m_property_table.get( ( java.lang.String ) enumeration.nextElement() ); } } - if ( enum.hasMoreElements() ) + if ( enumeration.hasMoreElements() ) { java.util.Vector propertyTableKeys = new java.util.Vector(); - while ( enum.hasMoreElements() ) + while ( enumeration.hasMoreElements() ) { propertyTableKeys.addElement( m_property_table.get( - ( java.lang.String ) enum.nextElement() ) ); + ( java.lang.String ) enumeration.nextElement() ) ); } org.omg.CosPropertyService.Property[] the_rest = new org.omg.CosPropertyService.Property[ propertyTableKeys.size() ]; @@ -569,12 +569,12 @@ */ public boolean delete_all_properties() { - java.util.Enumeration enum = m_property_table.keys(); - while ( enum.hasMoreElements() ) + java.util.Enumeration enumeration = m_property_table.keys(); + while ( enumeration.hasMoreElements() ) { try { - delete_property( ( java.lang.String ) enum.nextElement() ); + delete_property( ( java.lang.String ) enumeration.nextElement() ); } // not interested in exceptions catch ( org.omg.CosPropertyService.PropertyNotFound ex ) { |
|
From: <lk...@us...> - 2004-11-19 22:35:28
|
Update of /cvsroot/openorb/PropertyService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25714 Modified Files: WHATSNEW Log Message: Renamed "enum" variables to allow compilation on JDK 1.5 Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/PropertyService/WHATSNEW,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- WHATSNEW 29 Jul 2004 09:48:12 -0000 1.24 +++ WHATSNEW 19 Nov 2004 22:35:16 -0000 1.25 @@ -1,6 +1,8 @@ OpenORB PropertyService ----------------------- +- Renamed "enum" variables to allow compilation on JDK 1.5 + Version 1.4.0 BETA2 - July, 29 2004 - PropertyService_1_4_0_BETA2 - Upgraded to checkstyle 3.3. |
|
From: <lk...@us...> - 2004-11-17 15:26:19
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/iiop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6281/src/main/org/openorb/orb/iiop Modified Files: IIOPTransport.java Log Message: changed logging so that errors are only logged if there is a real problem. also avoid the "log and rethrow" idiom, as it leads to duplicate log entries Index: IIOPTransport.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/iiop/IIOPTransport.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- IIOPTransport.java 12 Aug 2004 12:54:24 -0000 1.17 +++ IIOPTransport.java 17 Nov 2004 15:26:08 -0000 1.18 @@ -252,7 +252,7 @@ // wait for EOF from other end. if ( m_message_error || m_minor_version == 2 || m_host == null ) { - // read and discard any extra incomming messages. + // read and discard any extra incoming messages. Object recv; do { @@ -268,7 +268,10 @@ } catch ( EOFException ex ) { - getLogger().warn( "An EOFException occured during recvMessage()!", ex ); + // communication partner has closed socket + // this is expected behaviour during close(), so don't log errors here! + getLogger().debug( "An EOFException occured during recvMessage() " + + "while closing connection!", ex ); } } @@ -566,10 +569,6 @@ } catch ( final IOException ex ) { - if ( getLogger().isErrorEnabled() ) - { - getLogger().error( "IOException while reading from input stream.", ex ); - } throw ExceptionTool.initCause( new COMM_FAILURE( "IOException while reading from input stream (" + ex + ")", IIOPMinorCodes.COMM_FAILURE_IO_EXCEPTION, @@ -577,10 +576,6 @@ } // m == -1 so the end of the stream has been reached - if ( getLogger().isErrorEnabled() ) - { - getLogger().error( "The end of the stream has been reached, no bytes available!" ); - } throw new EOFException( "The end of the stream has been reached, no bytes available!" ); } @@ -676,13 +671,10 @@ } catch ( IOException ex ) { - if ( getLogger().isErrorEnabled() ) - { - getLogger().error( "IOException while reading from input stream.", ex ); - } - throw new org.omg.CORBA.COMM_FAILURE( "IOException while reading from input stream", + throw ExceptionTool.initCause( new org.omg.CORBA.COMM_FAILURE( + "IOException while reading from input stream", IIOPMinorCodes.COMM_FAILURE_IO_EXCEPTION, - org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE ); + org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE ), ex ); } } @@ -702,8 +694,6 @@ } catch ( final EOFException ex ) { - getLogger().error( "Unexpected end of stream.", ex ); - throw ExceptionTool.initCause( new COMM_FAILURE( "Unexpected end of stream (" + ex + ")", IIOPMinorCodes.COMM_FAILURE_EOF, @@ -711,10 +701,6 @@ } catch ( IOException ex ) { - if ( getLogger().isErrorEnabled() ) - { - getLogger().error( "IOException while reading from input stream.", ex ); - } throw ExceptionTool.initCause( new COMM_FAILURE( "IOException while reading from input stream (" + ex + ")", IIOPMinorCodes.COMM_FAILURE_IO_EXCEPTION, |
|
From: <lk...@us...> - 2004-11-16 09:04:38
|
Update of /cvsroot/openorb/PersistentStateService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2102 Modified Files: WHATSNEW Log Message: Fixed ArrayIndexOutOfBoundsException in MemoryIterator.detach() Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/WHATSNEW,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- WHATSNEW 10 Aug 2004 19:00:04 -0000 1.40 +++ WHATSNEW 16 Nov 2004 09:04:23 -0000 1.41 @@ -1,6 +1,8 @@ OpenORB PersistentStateService ------------------------------ +- Fixed ArrayIndexOutOfBoundsException in MemoryIterator.detach() + - After an SQL Exception the DB Connection is now tested by executing a select statement. By default that statement is "SELECT 1 + 1" but can be overwritten for Database engines (e.g. Oracle) that do not |
|
From: <lk...@us...> - 2004-11-16 09:04:38
|
Update of /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/memory In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2102/src/main/org/openorb/pss/connector/memory Modified Files: MemoryIterator.java Log Message: Fixed ArrayIndexOutOfBoundsException in MemoryIterator.detach() Index: MemoryIterator.java =================================================================== RCS file: /cvsroot/openorb/PersistentStateService/src/main/org/openorb/pss/connector/memory/MemoryIterator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MemoryIterator.java 10 Feb 2004 21:19:16 -0000 1.5 +++ MemoryIterator.java 16 Nov 2004 09:04:23 -0000 1.6 @@ -45,10 +45,7 @@ */ public boolean hasMoreElements() { - if ( _index < _incarnations.length ) - return true; - - return false; + return ( _index < _incarnations.length ); } /** @@ -75,7 +72,14 @@ */ public org.omg.CosPersistentState.StorageObject detach() { - return ( org.omg.CosPersistentState.StorageObject ) _incarnations[ _index ]; + if ( _index < _incarnations.length ) + { + return ( org.omg.CosPersistentState.StorageObject ) _incarnations[ _index ]; + } + else + { + return null; + } } /** |
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4887/src/main/org/openorb/orb/rmi Modified Files: DeserializationKernelFactory.java ValueHandlerImpl.java Added Files: LazyInitDeserializationKernel.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 --- NEW FILE: LazyInitDeserializationKernel.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 DeserializationKernel that delegates all operations to another kernel, * the delegate is created on demand. * @author lkuehne */ class LazyInitDeserializationKernel implements DeserializationKernel { private DeserializationKernel m_delegate = null; private final String m_delegateShortName; LazyInitDeserializationKernel( String delegateShortName ) { m_delegateShortName = delegateShortName; } private synchronized void ensureDelegateInitialized() { if ( m_delegate == null ) { m_delegate = DeserializationKernelFactory.createDeserializationKernel( m_delegateShortName ); } } public Object allocateNewObject( Class c, Class base ) throws InstantiationException, IllegalAccessException { ensureDelegateInitialized(); return m_delegate.allocateNewObject( c, base ); } public void setObjectField( Class c, String n, Object o, Object v ) { ensureDelegateInitialized(); m_delegate.setObjectField( c, n, o, v ); } public void setBooleanField( Class c, String n, Object o, boolean v ) { ensureDelegateInitialized(); m_delegate.setBooleanField( c, n, o, v ); } public void setByteField( Class c, String n, Object o, byte v ) { ensureDelegateInitialized(); m_delegate.setByteField( c, n, o, v ); } public void setCharField( Class c, String n, Object o, char v ) { ensureDelegateInitialized(); m_delegate.setCharField( c, n, o, v ); } public void setShortField( Class c, String n, Object o, short v ) { ensureDelegateInitialized(); m_delegate.setShortField( c, n, o, v ); } public void setIntField( Class c, String n, Object o, int v ) { ensureDelegateInitialized(); m_delegate.setIntField( c, n, o, v ); } public void setLongField( Class c, String n, Object o, long v ) { ensureDelegateInitialized(); m_delegate.setLongField( c, n, o, v ); } public void setFloatField( Class c, String n, Object o, float v ) { ensureDelegateInitialized(); m_delegate.setFloatField( c, n, o, v ); } public void setDoubleField( Class c, String n, Object o, double v ) { ensureDelegateInitialized(); m_delegate.setDoubleField( c, n, o, v ); } } Index: DeserializationKernelFactory.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/DeserializationKernelFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- DeserializationKernelFactory.java 28 Jul 2004 12:08:42 -0000 1.7 +++ DeserializationKernelFactory.java 14 Nov 2004 21:38:35 -0000 1.8 @@ -60,28 +60,29 @@ * </ul> * * @author Michael Rumpf + * @author lkuehne */ public final class DeserializationKernelFactory { /** A static instance of the deserialization native hook. */ private static DeserializationKernel s_kernel = null; - /** True when a native library should be used by the marshaling engine. */ - private static boolean s_use_native_library = false; + /** description of the deserialization mechanism to be used by the marshaling engine. */ + private static String s_deserializationEngine = "lazy:auto"; + private static final String LAZY_PREFIX = "lazy:"; private DeserializationKernelFactory() { } /** - * Set the property whether to use a native library or not. + * Set the deserialization engine to use. * - * @param use_native_library True when a native library should be used, - * false otherwise. + * @param deserializationEngine either auto or native, maybe prefixed with 'lazy:'. */ - public static void setUseNativeLibrary( boolean use_native_library ) + public static void setDeserializationEngine( String deserializationEngine ) { - s_use_native_library = use_native_library; + s_deserializationEngine = deserializationEngine; } /** @@ -92,98 +93,124 @@ * * @return The DeserializationKernel wrapper for the current VM. */ - public static synchronized DeserializationKernel init() + public static synchronized DeserializationKernel retrieveDeserializationKernel() { if ( s_kernel != null ) { return s_kernel; } - if ( s_use_native_library ) + if ( s_deserializationEngine.startsWith( LAZY_PREFIX ) + && s_deserializationEngine.length() > LAZY_PREFIX.length() ) { - s_kernel = new DeserializationKernelNative(); + String delegateShortName = s_deserializationEngine.substring( LAZY_PREFIX.length() ); + s_kernel = new LazyInitDeserializationKernel( delegateShortName ); } else { - try - { - Thread.currentThread().getContextClassLoader().loadClass( - "com.sun.corba.se.internal.io.IIOPInputStream" ); - s_kernel = new DeserializationKernelSun(); - } - catch ( ClassNotFoundException ex ) - { - // no Sun JDK - } + s_kernel = createDeserializationKernel( s_deserializationEngine ); + } - if ( s_kernel == null ) - { - try - { - Thread.currentThread().getContextClassLoader().loadClass( - "com.ibm.rmi.io.JNIReflectField" ); - s_kernel = new DeserializationKernelIBM(); - } - catch ( ClassNotFoundException ex ) - { - // no IBM JDK 1.3.x - } - } + return s_kernel; + } - if ( s_kernel == null ) - { - // The following check is not working under AIX JDK version 1.4.x - // so don'teven try it instead give the following checks a chance - // to succeed - final String os_name = System.getProperty( "os.name" ); - final String vm_version = System.getProperty( "java.vm.version" ); - if ( !os_name.equalsIgnoreCase( "AIX" ) - || !vm_version.startsWith( "1.4." ) ) - { - try - { - Thread.currentThread().getContextClassLoader().loadClass( - "com.ibm.rmi.io.PureReflectField" ); - s_kernel = new DeserializationKernelIBM14(); - } - catch ( ClassNotFoundException ex ) - { - // no valid IBM JDK 1.4.x - } - } - else - { - // This is the broken version - s_kernel = new DeserializationKernelNative(); - } - } - // - // add more VMs here !!!!!!!!!!! - // - /* - if ( s_kernel == null ) - { - try - { - Class clz = Class.forName( "<UNIQUE CLASS FOR VM OF VENDOR XYZ>" ); - // This class needs to be implemented for each JDK - //s_kernel = new DeserializationKernelXYZ(); - } - catch ( ClassNotFoundException ex ) - { - // no XYZ JDK - } - } - */ + /** + * @param deserializationEngine engine descriptor, "lazy:" prefix not allowed here. + * @return the requested DeserializationKernel + */ + static DeserializationKernel createDeserializationKernel( String deserializationEngine ) + { + if ( "auto".equals( deserializationEngine ) ) + { + return createAutoDeserializationKernel(); + } + else if ( "native".equals( deserializationEngine ) ) + { + return new DeserializationKernelNative(); + } + else if ( "none".equals( deserializationEngine ) ) + { + return new NullDeserializationKernel(); + } + throw new IllegalArgumentException( "unsupported iiop.deserializationEngine '" + + deserializationEngine + "', must be 'auto', 'native' or 'none'" ); + } - if ( s_kernel == null ) - { - throw new Error( "Unknown VM vendor. RMIoverIIOP will not work" - + " with this VM. Please contact support at ope...@li...." ); - } + private static DeserializationKernel createAutoDeserializationKernel() + { + try + { + Thread.currentThread().getContextClassLoader().loadClass( + "com.sun.corba.se.internal.io.IIOPInputStream" ); + return new DeserializationKernelSun(); } - return s_kernel; + catch ( ClassNotFoundException ex ) + { + // no Sun JDK + } + + try + { + Thread.currentThread().getContextClassLoader().loadClass( + "com.ibm.rmi.io.JNIReflectField" ); + return new DeserializationKernelIBM(); + } + catch ( ClassNotFoundException ex ) + { + // no IBM JDK 1.3.x + } + + // The following check is not working under AIX JDK version 1.4.x + // so don'teven try it instead give the following checks a chance + // to succeed + final String os_name = System.getProperty( "os.name" ); + final String vm_version = System.getProperty( "java.vm.version" ); + if ( !os_name.equalsIgnoreCase( "AIX" ) + || !vm_version.startsWith( "1.4." ) ) + { + try + { + Thread.currentThread().getContextClassLoader().loadClass( + "com.ibm.rmi.io.PureReflectField" ); + return new DeserializationKernelIBM14(); + } + catch ( ClassNotFoundException ex ) + { + // no valid IBM JDK 1.4.x + } + } + else + { + // This is the broken version + return new DeserializationKernelNative(); + } + + // + // add more VMs here !!!!!!!!!!! + // + /* + try + { + Class clz = Class.forName( "<UNIQUE CLASS FOR VM OF VENDOR XYZ>" ); + // This class needs to be implemented for each JDK + return new DeserializationKernelXYZ(); + } + catch ( ClassNotFoundException ex ) + { + // no XYZ JDK + } + */ + + String vmName = System.getProperty( "java.vm.name" ); // Java HotSpot(TM) Client VM + String vmVersion = System.getProperty( "java.vm.version" ); // 1.4.2-b28 + String vmVendor = System.getProperty( "java.vm.vendor" ); // Sun Microsystems Inc. + + throw new Error( "Unknown VM and iiop.deserializationEngine set to 'auto'. " + + "RMIoverIIOP will not work with this VM (" + + vmName + ' ' + vmVersion + ", " + vmVendor + + "). Please try the native engine or " + + "contact support at ope...@li...." ); } } Index: ValueHandlerImpl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/ValueHandlerImpl.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ValueHandlerImpl.java 20 Aug 2004 10:08:13 -0000 1.10 +++ ValueHandlerImpl.java 14 Nov 2004 21:38:35 -0000 1.11 @@ -55,7 +55,8 @@ private static final Object SYNC_INSTANCE = new Object(); private static ValueHandlerImpl s_value_handler_instance; - private static DeserializationKernel s_kernel = DeserializationKernelFactory.init(); + private static DeserializationKernel s_kernel = + DeserializationKernelFactory.retrieveDeserializationKernel(); private static org.omg.CORBA.WStringValueHelper s_string_helper = new org.omg.CORBA.WStringValueHelper(); |
2 messages has been excluded from this view by a project administrator.
