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...> - 2005-03-28 06:55:41
|
Update of /cvsroot/openorb/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17246 Modified Files: WHATSNEW Log Message: Added release tags to the WHATSNEW files Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/admin/WHATSNEW,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- WHATSNEW 29 Jul 2004 11:48:57 -0000 1.13 +++ WHATSNEW 28 Mar 2005 06:55:27 -0000 1.14 @@ -1,6 +1,10 @@ OpenORB admin ------------- +Version 1.4.0 - March, 28 2005 - admin_1_4_0_FINAL + +[no changes] + Version 1.4.0 BETA2 - July, 29 2004 - admin_1_4_0_BETA2 - Fixed buildtagged.sh script to work with the latest versions |
|
From: <lk...@us...> - 2005-03-28 05:55:48
|
Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16358/src/main/org/openorb/ots/Impl Modified Files: XID.java Log Message: Fixed a potential bug in generation of unique XIDs, it allowed to generate the same id within the same millisecond. Index: XID.java =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/XID.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- XID.java 13 Dec 2004 10:39:59 -0000 1.11 +++ XID.java 28 Mar 2005 05:55:39 -0000 1.12 @@ -15,6 +15,10 @@ */ public class XID { + /** sequence id, used for generating unique ids. */ + private static int s_seqId = 0; + + /** Cache for the host address. */ private static String s_hostAddress = null; static @@ -173,13 +177,20 @@ */ private byte [] generate_id() { + // TODO: investigate java.util.UUID (introduced in JDK 1.5) + // should have much better performance and generate shorter byte arrays + synchronized ( XID.class ) { // First, we include the Time String id = "[" + System.currentTimeMillis() + "]"; + // add a sequence id to avoid generating the same UID within the same msec + // note that we need to sync access to s_seqId to avoid using the same id twice + id = id + ( s_seqId++ ); + // Now, we get OpenORB information about IP Address - id = id + getServerHostAddress(); + id = id + '@' + getServerHostAddress(); return id.getBytes(); } |
|
From: <lk...@us...> - 2005-03-28 05:55:48
|
Update of /cvsroot/openorb/TransactionService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16358 Modified Files: WHATSNEW Log Message: Fixed a potential bug in generation of unique XIDs, it allowed to generate the same id within the same millisecond. Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/TransactionService/WHATSNEW,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- WHATSNEW 26 Jan 2005 17:06:05 -0000 1.39 +++ WHATSNEW 28 Mar 2005 05:55:39 -0000 1.40 @@ -1,6 +1,9 @@ OpenORB TransactionService -------------------------- +- Fixed a potential bug in generation of unique XIDs, it allowed to generate + the same id within the same millisecond. + - removed reference to the JDK tools.jar from build.xml to allow compilation on OSX |
|
From: <lk...@us...> - 2005-03-27 17:48:08
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6481 Modified Files: WHATSNEW Log Message: fixed NPE in idl2java Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.235 retrieving revision 1.236 diff -u -d -r1.235 -r1.236 --- WHATSNEW 13 Mar 2005 13:08:30 -0000 1.235 +++ WHATSNEW 27 Mar 2005 17:47:58 -0000 1.236 @@ -1,6 +1,10 @@ OpenORB ------- +- Fixed a NPE in the compiler (regression between 1.3.1 and 1.4.0 beta2). + See http://marc.theaimsgroup.com/?l=openorb-devel&m=111073137117247&w=2 + for a complete problem description. + - Replaced usage of inherited fields 'project' and 'location' in compiler Task implementations with accessor methods. |
|
From: <lk...@us...> - 2005-03-27 07:32:46
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/generator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10031 Modified Files: IdlToJava.java Log Message: fixed regression reported by Andrew ``Bass'' Shcheglov, see http://marc.theaimsgroup.com/?l=openorb-devel&m=111073137117247&w=2 minor improvements in coding style along the way Index: IdlToJava.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/generator/IdlToJava.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- IdlToJava.java 5 May 2004 07:29:08 -0000 1.22 +++ IdlToJava.java 27 Mar 2005 07:32:35 -0000 1.23 @@ -8,14 +8,46 @@ package org.openorb.compiler.generator; -import java.util.*; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import org.openorb.compiler.CompilerProperties; - -import org.openorb.compiler.object.*; -import org.openorb.compiler.parser.*; - +import org.openorb.compiler.object.IdlArray; +import org.openorb.compiler.object.IdlAttribute; +import org.openorb.compiler.object.IdlComment; +import org.openorb.compiler.object.IdlCommentField; +import org.openorb.compiler.object.IdlCommentSection; +import org.openorb.compiler.object.IdlConst; +import org.openorb.compiler.object.IdlContext; +import org.openorb.compiler.object.IdlEnumMember; +import org.openorb.compiler.object.IdlFactoryMember; +import org.openorb.compiler.object.IdlFixed; +import org.openorb.compiler.object.IdlIdent; +import org.openorb.compiler.object.IdlInclude; +import org.openorb.compiler.object.IdlInterface; +import org.openorb.compiler.object.IdlObject; +import org.openorb.compiler.object.IdlOp; +import org.openorb.compiler.object.IdlParam; +import org.openorb.compiler.object.IdlRaises; +import org.openorb.compiler.object.IdlSequence; +import org.openorb.compiler.object.IdlSimple; +import org.openorb.compiler.object.IdlStateMember; +import org.openorb.compiler.object.IdlString; +import org.openorb.compiler.object.IdlStructMember; +import org.openorb.compiler.object.IdlUnion; +import org.openorb.compiler.object.IdlUnionMember; +import org.openorb.compiler.object.IdlValue; +import org.openorb.compiler.object.IdlValueBox; +import org.openorb.compiler.object.IdlValueInheritance; +import org.openorb.compiler.object.IdlWString; +import org.openorb.compiler.parser.IdlType; +import org.openorb.compiler.parser.Token; import org.openorb.util.CharacterCache; /** @@ -94,7 +126,6 @@ * * @param obj native object * @param output file where definition is added - * @return true if a definition exists */ public void printNativeDefinition(IdlObject obj, java.io.PrintWriter output) { @@ -809,8 +840,7 @@ { List v = new ArrayList(); IdlObject obj2 = obj; - String name = new String(""); - String s; + String name = ""; boolean first = false; while (obj2 != null) @@ -848,7 +878,14 @@ } } - obj2 = obj2.upper(); + // IdlStructMembers sometimes have a null name. + // In that case we proceed further towards the root of the tree + // to avoid a NPE in the next loop. See also + // http://marc.theaimsgroup.com/?l=openorb-devel&m=111073137117247&w=2 + do + { + obj2 = obj2.upper(); + } while (obj2.name() == null); first = true; } @@ -857,35 +894,46 @@ { if (!obj.included()) { - if (!m_cp.getM_packageName().equals("")) + if (m_cp.getM_packageName().length() > 0) { if (!((m_cp.getM_packageName().equals("generated")) && (m_cp.getM_use_package() == false))) - name = adaptToDot(m_cp.getM_packageName()); + { + name = adaptToDot(m_cp.getM_packageName()); + } } } } if (m_cp.getM_usePrefix()) + { if (obj.getPrefix() != null) { - if (!name.equals("")) - name = name + "."; + if (name.length() > 0) + { + name = name + "."; + } if (m_cp.getM_reversePrefix()) - name = name + inversedPrefix(obj.getPrefix()); + { + name = name + inversedPrefix(obj.getPrefix()); + } else - name = name + obj.getPrefix(); + { + name = name + obj.getPrefix(); + } } + } for (int i = v.size() - 1; i >= 0; i--) { - s = (String) v.get(i); + String s = (String) v.get(i); if (s != null) { - if (!name.equals("")) + if (name.length() > 0) + { name = name + "."; - + } name = name + s; } } @@ -8604,8 +8652,8 @@ * Check if the operation or the attribute is already in the list * * @param opList operations and attributes list - * @param op the operation or attribute - * @return true if the operation or attribute is included in the list + * @param obj the operation or attribute + * @return true if the operation or attribute is included in the list */ public boolean isInto(List opList, IdlObject obj) { @@ -8701,7 +8749,7 @@ * (incl. the inheritance). * * @param obj the interface object - * @param opList already found operations and attributes list + * @param inList already found operations and attributes list * @return operations and attributes list */ protected List getInheritanceList(IdlObject obj, List inList) @@ -8720,7 +8768,7 @@ for (int i = 0; i < inList.size(); i++) { - if (((String) inList.get(i)).equals(obj.getId())) + if ((inList.get(i)).equals(obj.getId())) { found = true; break; @@ -9604,18 +9652,21 @@ */ public void translate_module(IdlObject obj, java.io.File writeInto, int translateType) { - String old_pkg; + final String name = obj.name(); java.io.File intoModule; - if (translateType == 0) - intoModule = createDirectory(obj.name(), writeInto); + { + intoModule = createDirectory(name, writeInto); + } else - intoModule = getDirectory(obj.name(), writeInto); + { + intoModule = getDirectory(name, writeInto); + } - old_pkg = current_pkg; + String old_pkg = current_pkg; - addToPkg(obj, obj.name()); + addToPkg(obj, name); translate_object(obj, intoModule, translateType); @@ -10591,94 +10642,95 @@ */ public void translate_object_content(IdlObject obj, java.io.File writeInto, int translateType) { - switch (obj.current().kind()) + final IdlObject current = obj.current(); + switch (current.kind()) { case IdlType.e_module : - translate_module(obj.current(), writeInto, translateType); + translate_module(current, writeInto, translateType); break; case IdlType.e_const : if (translateType == 0) - translate_constant(obj.current(), writeInto, null); + translate_constant(current, writeInto, null); break; case IdlType.e_enum : if (translateType == 0) - translate_enum(obj.current(), writeInto); + translate_enum(current, writeInto); break; case IdlType.e_struct : if (translateType == 0) - translate_struct(obj.current(), writeInto); + translate_struct(current, writeInto); break; case IdlType.e_union : if (translateType == 0) - translate_union(obj.current(), writeInto); + translate_union(current, writeInto); break; case IdlType.e_typedef : if (translateType == 0) - translate_typedef(obj.current(), writeInto); + translate_typedef(current, writeInto); break; case IdlType.e_exception : if (translateType == 0) - translate_exception(obj.current(), writeInto); + translate_exception(current, writeInto); break; case IdlType.e_native : if (translateType == 0) - translate_native(obj.current(), writeInto); + translate_native(current, writeInto); break; case IdlType.e_value_box : if (translateType == 0) - translate_value_box(obj.current(), writeInto); + translate_value_box(current, writeInto); break; case IdlType.e_value : if (translateType == 0) - translate_value_type(obj.current(), writeInto); + translate_value_type(current, writeInto); break; case IdlType.e_interface : if (translateType == 0) - translate_interface(obj.current(), writeInto); + translate_interface(current, writeInto); else if (translateType == 1) { - if (((IdlInterface) (obj.current())).local_interface() == false) - translate_interface_stub(obj.current(), writeInto); + if (((IdlInterface) current).local_interface() == false) + translate_interface_stub(current, writeInto); } else if (translateType == 2) { - if (((IdlInterface) (obj.current())).abstract_interface() == false) + if (((IdlInterface) current).abstract_interface() == false) { - if (((IdlInterface) (obj.current())).local_interface() == false) - translate_interface_skel(obj.current(), writeInto); + if (((IdlInterface) current).local_interface() == false) + translate_interface_skel(current, writeInto); } } else { if (translateType == 3) { - if (((IdlInterface) (obj.current())).abstract_interface() == false) + if (((IdlInterface) current).abstract_interface() == false) { - if (((IdlInterface) (obj.current())).local_interface() == false) - translate_interface_tie(obj.current(), writeInto); + if (((IdlInterface) current).local_interface() == false) + translate_interface_tie(current, writeInto); } } } @@ -10703,27 +10755,31 @@ { java.io.File tmpInto = writeInto; - if (obj.current().included() == false) + final IdlObject current = obj.current(); + if (current.included() == false) { String old_pkg = current_pkg; if (m_cp.getM_usePrefix()) - if ((obj.current().getPrefix() != null) && (obj.kind() == IdlType.e_root)) + { + final String prefix = current.getPrefix(); + if ((prefix != null) && (obj.kind() == IdlType.e_root)) { if (translateType == 0) { - tmpInto = createPrefixDirectories(obj.current().getPrefix(), writeInto); + tmpInto = createPrefixDirectories(prefix, writeInto); } else { - tmpInto = getPrefixDirectories(obj.current().getPrefix(), writeInto); + tmpInto = getPrefixDirectories(prefix, writeInto); } if (m_cp.getM_reversePrefix()) - addToPkg(obj, inversedPrefix(obj.current().getPrefix())); + addToPkg(obj, inversedPrefix(prefix)); else - addToPkg(obj, obj.current().getPrefix()); + addToPkg(obj, prefix); } + } translate_object_content(obj, tmpInto, translateType); |
|
From: <lk...@us...> - 2005-03-26 06:23:26
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26548 Modified Files: IdlCompiler.java Log Message: fixed tabs and incorrect Javadoc tags Index: IdlCompiler.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/IdlCompiler.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- IdlCompiler.java 13 Mar 2005 16:13:09 -0000 1.22 +++ IdlCompiler.java 26 Mar 2005 06:23:17 -0000 1.23 @@ -487,7 +487,7 @@ } /** - * @see org.openorb.compiler.Compiler#init_compiler(org.openorb.compiler.CompilerHost) + * @see org.openorb.compiler.CompilerIF#init_compiler */ public void init_compiler( CompilerHost ch, CompilerProperties cp ) { @@ -597,7 +597,7 @@ } /** - * @see org.openorb.compiler.CompilerConnector#output_text(java.lang.String) + * @see org.openorb.compiler.CompilerHost#display(java.lang.String) */ public void display( String s ) { @@ -689,7 +689,7 @@ catch ( Throwable th ) { th.printStackTrace(); - // ignore, return code + // ignore, return code } System.exit( return_code ); } |
|
From: <lk...@us...> - 2005-03-26 06:20:34
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24611 Modified Files: DeserializationKernelSun15.java Log Message: make sure the code compiles on JDK 1.3 Index: DeserializationKernelSun15.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/DeserializationKernelSun15.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- DeserializationKernelSun15.java 28 Feb 2005 10:08:45 -0000 1.1 +++ DeserializationKernelSun15.java 26 Mar 2005 06:20:10 -0000 1.2 @@ -30,7 +30,7 @@ static { Method method = null; - try + try { method = ObjectStreamClass.class.getDeclaredMethod( "newInstance", new Class[]{} ); method.setAccessible( true ); @@ -95,17 +95,19 @@ } catch ( final InvocationTargetException e ) { - if ( e.getCause() instanceof InstantiationException ) + // TODO: use getCause() after converting OpenORB to JDK 1.4 + final Throwable cause = e.getTargetException(); + if ( cause instanceof InstantiationException ) { - throw ( InstantiationException ) e.getTargetException(); + throw ( InstantiationException ) cause; } - if ( e.getCause() instanceof IllegalAccessException ) + if ( cause instanceof IllegalAccessException ) { - throw ( IllegalAccessException ) e.getTargetException(); + throw ( IllegalAccessException ) cause; } throw ExceptionTool.initCause( new Error( "Unexpected exception (" - + e.getTargetException() + ")" ), e.getCause() ); + + cause + ")" ), cause ); } } |
|
From: <lk...@us...> - 2005-03-20 12:46:16
|
Update of /cvsroot/openorb/admin/release In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32212/release Modified Files: HOWTO Log Message: added release instructions posted by Michael some time ago Index: HOWTO =================================================================== RCS file: /cvsroot/openorb/admin/release/HOWTO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- HOWTO 29 Jul 2004 09:36:26 -0000 1.6 +++ HOWTO 20 Mar 2005 12:46:04 -0000 1.7 @@ -52,6 +52,57 @@ o website (no release) +Release Process +=============== + +All the docs or scripts are in the admin module. + +Quick HOWTO, using release 1.4.0 as an example: +0. Get a fresh HEAD revision of all modules: + cvs co OpenORBAll + cvs co admin + cvs co native +1. Perform a release build: ./admin/bin/build.sh release +2. Add a release line with the tag name into the WHATSNEW file: + Version 1.4.0 - November, 12 2004 - OpenORB_1_4_0_FINAL +3. When everything is ok (tests are working), create the tag + (see admin/release/HOWTO) for the tag and branch names). +4. Then do a fresh checkout from the tag and rerun the build + by using the buildtagged.sh script. +5. Afterwards you will have a SFUP (SourceForge UPload) + folder in TCOO_HOME. +6. Using the upload.sh script allows you to upload all + files into the SF upload area. +7. The next step is to go to the SF File Release System + and follow the steps: + Step1: + - For each module "Add Release": 1.4.0 + - Use the same "Release Date" for all modules. + - Paste the Changelog from 1.3.0 to 1.4.0 + into the "Paste The Change Log In:" box + (preserve my preformatted text). + Step2: + - Select the files for this module. + ATTENTION: The files must be fully uploaded! + If you select the files whilke they are being uploaded + you will end up with broken archives! + Step 3: + - Select "Processor: Platform Independent", + "Release Date: 2004-11-12" (example) + "File Type: Source .gz, Source .zip, .gz, .zip" + Step 4: + - Send all users monitoring the release a notification. +8. Finally you can declare former BETAx releases as "hidden". +9. Write the release notes with the major +10. The OpenORB homepage will get updated automatically when + you post the release notes as project news. +11. Announce the release by posting the release notes. + (The release notes should finally be added to + admin/release/RELEASE_NOTES_1_4_0.txt) + +I guess the native module will not be included in the automatic build +scripts and should either be added or built manually. + Announments: ============ |
|
From: <lk...@us...> - 2005-03-13 16:13:19
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6620/src/compiler/org/openorb/compiler Modified Files: IdlCompiler.java Log Message: dump stacktrace in the event of errors Index: IdlCompiler.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/IdlCompiler.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- IdlCompiler.java 4 Jun 2004 13:10:59 -0000 1.21 +++ IdlCompiler.java 13 Mar 2005 16:13:09 -0000 1.22 @@ -688,7 +688,8 @@ } catch ( Throwable th ) { - // ignore, return code + th.printStackTrace(); + // ignore, return code } System.exit( return_code ); } |
|
From: <lk...@us...> - 2005-03-13 13:08:56
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21226 Modified Files: WHATSNEW Log Message: replaced usage of inherited fields 'project' and 'location' with accessor methods Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.234 retrieving revision 1.235 diff -u -d -r1.234 -r1.235 --- WHATSNEW 28 Feb 2005 10:08:46 -0000 1.234 +++ WHATSNEW 13 Mar 2005 13:08:30 -0000 1.235 @@ -1,6 +1,9 @@ OpenORB ------- +- Replaced usage of inherited fields 'project' and 'location' in compiler + Task implementations with accessor methods. + - Implemented a deserialization kernel for Java 1.5 (Sun). As the reflection API has been enhanced to allow final fields to be set by setting the accessible property on the field object, the only remaining vendor specific |
|
From: <lk...@us...> - 2005-03-13 13:05:37
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/taskdefs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20370/src/compiler/org/openorb/compiler/taskdefs Modified Files: Java2Idl.java Idl2Java.java GenericTask.java Log Message: replaced usage of inherited fields 'project' and 'location' with accessor methods with Index: Java2Idl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/taskdefs/Java2Idl.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Java2Idl.java 10 Feb 2004 21:46:19 -0000 1.9 +++ Java2Idl.java 13 Mar 2005 13:05:18 -0000 1.10 @@ -271,7 +271,7 @@ else { m_param_exception = - new BuildException( "Invalid symbol definition", location ); + new BuildException( "Invalid symbol definition", getLocation() ); } } @@ -301,7 +301,7 @@ m_param_exception = new BuildException( "Invalid native mapping definition", - location ); + getLocation() ); } } Index: Idl2Java.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/taskdefs/Idl2Java.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Idl2Java.java 10 Feb 2004 21:02:42 -0000 1.16 +++ Idl2Java.java 13 Mar 2005 13:05:19 -0000 1.17 @@ -245,7 +245,7 @@ else { m_param_exception = - new BuildException( "Invalid symbol definition", location ); + new BuildException( "Invalid symbol definition", getLocation() ); } } @@ -275,7 +275,7 @@ m_param_exception = new BuildException( "Invalid native mapping definition", - location ); + getLocation() ); } } Index: GenericTask.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/taskdefs/GenericTask.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- GenericTask.java 10 Feb 2004 21:02:42 -0000 1.10 +++ GenericTask.java 13 Mar 2005 13:05:19 -0000 1.11 @@ -138,7 +138,7 @@ { if ( m_src_path == null ) { - m_src_path = new Path( project ); + m_src_path = new Path( getProject() ); } return m_src_path.createPath(); @@ -242,7 +242,7 @@ } catch ( org.openorb.compiler.parser.CompilationException ex ) { - throw new BuildException( "there are errors...", location ); + throw new BuildException( "there are errors...", getLocation() ); } // write the dependency cache to disk @@ -319,25 +319,25 @@ // load the IDL file list from the include and path structures if ( m_src_path == null ) { - throw new BuildException( "srcdir attribute must be set!", location ); + throw new BuildException( "srcdir attribute must be set!", getLocation() ); } if ( m_src_path.size() == 0 ) { - throw new BuildException( "srcdir attribute must be set!", location ); + throw new BuildException( "srcdir attribute must be set!", getLocation() ); } String[] list = m_src_path.list(); for ( int jl = 0; jl < list.length; jl++ ) { - File srcDir = project.resolveFile( list[ jl ] ); + File srcDir = getProject().resolveFile( list[ jl ] ); if ( !srcDir.exists() ) { throw new BuildException( "srcdir \"" + srcDir.getPath() + "\" doesn't exist!", - location ); + getLocation() ); } if ( srcDir.isDirectory() ) |
|
From: <lk...@us...> - 2005-03-13 13:00:13
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/ir In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19023/src/compiler/org/openorb/compiler/ir Modified Files: IdlFromIR.java Log Message: removed unneccesary type cast Index: IdlFromIR.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/ir/IdlFromIR.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- IdlFromIR.java 10 Feb 2004 21:46:19 -0000 1.4 +++ IdlFromIR.java 13 Mar 2005 12:59:56 -0000 1.5 @@ -1224,7 +1224,7 @@ while ( token.hasMoreTokens() ) { - name = ( String ) token.nextToken(); + name = token.nextToken(); if ( token.hasMoreTokens() == false ) return parent; |
|
From: <lk...@us...> - 2005-03-13 12:55:53
|
Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18154/src/compiler/org/openorb/compiler Modified Files: CompilerIF.java Log Message: fixed javadoc param name Index: CompilerIF.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/CompilerIF.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- CompilerIF.java 16 Feb 2004 09:41:52 -0000 1.6 +++ CompilerIF.java 13 Mar 2005 12:55:43 -0000 1.7 @@ -37,7 +37,7 @@ /** * Compile a file. * - * @param fl + * @param cle * @param cp * * @throws CompilationException |
|
From: Richard G C. <pim...@us...> - 2005-03-01 13:01:19
|
Update of /cvsroot/openorb/tools/src/main/org/openorb/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9930/tools/src/main/org/openorb/util Modified Files: JREVersion.java Log Message: JREVersion rewrite Index: JREVersion.java =================================================================== RCS file: /cvsroot/openorb/tools/src/main/org/openorb/util/JREVersion.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- JREVersion.java 5 Nov 2003 16:58:58 -0000 1.3 +++ JREVersion.java 1 Mar 2005 13:00:50 -0000 1.4 @@ -8,6 +8,8 @@ package org.openorb.util; +import java.math.BigDecimal; + /** * A utility class determinig the runtime version current JRE * @@ -16,27 +18,24 @@ */ public final class JREVersion { + private static final String VERSION_KEY = "java.specification.version"; + + private static final BigDecimal VERSION_1_4 = new BigDecimal( "1.4" ); + private static final BigDecimal VERSION_1_5 = new BigDecimal( "1.5" ); + + public static final BigDecimal VERSION = new BigDecimal( System.getProperty( VERSION_KEY ) ); + + /** * Indicates that the current JRE is at least 1.4 */ - public static final boolean V1_4; + public static final boolean V1_4 = VERSION_1_4.compareTo( VERSION ) <= 0; - static - { - final Class[] parameterTypes = {Throwable.class}; - boolean is1_4 = false; - try - { - Throwable.class.getMethod( "initCause", parameterTypes ); - is1_4 = true; - } - catch ( final NoSuchMethodException e ) - { - // now we know that this is a JDK older than 1.4 - } + /** + * Indicates that the current JRE is at least 1.5 + */ + public static final boolean V1_5 = VERSION_1_5.compareTo( VERSION ) <= 0; - V1_4 = is1_4; - } private JREVersion() { |
|
From: Richard G C. <pim...@us...> - 2005-02-28 10:14:26
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14087/OpenORB/src/main/org/openorb/orb/rmi Modified Files: LazyInitDeserializationKernel.java Log Message: added javadoc for SINGLETON Index: LazyInitDeserializationKernel.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/LazyInitDeserializationKernel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- LazyInitDeserializationKernel.java 28 Feb 2005 10:08:45 -0000 1.2 +++ LazyInitDeserializationKernel.java 28 Feb 2005 10:13:57 -0000 1.3 @@ -34,6 +34,12 @@ return s_delegateShortName; } + /** + * Thread safe lock-less lazy singleton. + * This class holds a reference to the singleton instance in VALUE static field. + * The singleton instance is instantiated when this class is loaded. + * This occurs when the getKernel() is called for the first time. + */ private static final class SINGLETON { static final DeserializationKernel VALUE |
|
From: Richard G C. <pim...@us...> - 2005-02-28 10:09:26
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12511/OpenORB/src/main/org/openorb/orb/rmi Modified Files: LazyInitDeserializationKernel.java DeserializationKernelFactory.java Added Files: DeserializationKernelSun15.java Log Message: - Implemented a deserialization kernel for Java 1.5 (Sun). As the reflection API has been enhanced to allow final fields to be set by setting the accessible property on the field object, the only remaining vendor specific hack is for the creation of Serializable objects where an object has to be created using the no-arg constructor of the first non Serializable super class. The current implementation uses the package local ObjectStreamClass.newInstance() method (via reflection) for this purpose. This kernel should work on all 1.5 platforms which provide this method. - Reimplemented LazyInitDeserializationKernel to use a thread safe lockless lazy singleton to remove the need to synchronize all calls. --- NEW FILE: DeserializationKernelSun15.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; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.io.ObjectStreamClass; import org.openorb.util.ExceptionTool; import org.openorb.util.JREVersion; /** * This is an implementation of the interface DeserializationKernel * for the Sun Java Runtime Environment version 1.5 onwards, which support * the package local newInstance method on the ObjectStreamClass. * * @version $Revision: 1.1 $ $Date: 2005/02/28 10:08:45 $ * @author Richard G Clark */ final class DeserializationKernelSun15 implements DeserializationKernel { private static final Method NEW_INSTANCE_METHOD; static { Method method = null; try { method = ObjectStreamClass.class.getDeclaredMethod( "newInstance", new Class[]{} ); method.setAccessible( true ); if ( !Object.class.equals( method.getReturnType() ) ) { method = null; } } catch ( final NoSuchMethodException e ) { // let method be null } NEW_INSTANCE_METHOD = method; } /** * Constructor is package protected so that it can be instantiated via the factory only. */ DeserializationKernelSun15() { if ( !isSupportedPlatform() ) { throw new Error( "Unsupported platform" ); } } static boolean isSupportedPlatform() { return JREVersion.V1_5 && ( null != NEW_INSTANCE_METHOD ); } private Field getAccessibleField( final Class c, final String n ) { try { final Field field = c.getDeclaredField( n ); field.setAccessible( true ); return field; } catch ( final NoSuchFieldException e ) { throw ExceptionTool.initCause( new Error( "Field [" + n + "] could not be found on class [" + c + "]" ), e ); } } /** * @see DeserializationKernel */ public Object allocateNewObject( final Class c, final Class base ) throws InstantiationException, IllegalAccessException { final ObjectStreamClass osc = ObjectStreamClass.lookup( c ); try { return NEW_INSTANCE_METHOD.invoke( osc, null ); } catch ( final InvocationTargetException e ) { if ( e.getCause() instanceof InstantiationException ) { throw ( InstantiationException ) e.getTargetException(); } if ( e.getCause() instanceof IllegalAccessException ) { throw ( IllegalAccessException ) e.getTargetException(); } throw ExceptionTool.initCause( new Error( "Unexpected exception (" + e.getTargetException() + ")" ), e.getCause() ); } } /** * @see DeserializationKernel */ public void setObjectField ( final Class c, final String n, final Object o, final Object v ) { final Field field = getAccessibleField( c, n ); try { field.set( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } /** * @see DeserializationKernel */ public void setBooleanField( final Class c, final String n, final Object o, final boolean v ) { final Field field = getAccessibleField( c, n ); try { field.setBoolean( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } /** * @see DeserializationKernel */ public void setByteField( final Class c, final String n, final Object o, final byte v ) { final Field field = getAccessibleField( c, n ); try { field.setByte( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } /** * @see DeserializationKernel */ public void setCharField( final Class c, final String n, final Object o, final char v ) { final Field field = getAccessibleField( c, n ); try { field.setChar( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } /** * @see DeserializationKernel */ public void setShortField( final Class c, final String n, final Object o, final short v ) { final Field field = getAccessibleField( c, n ); try { field.setShort( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } /** * @see DeserializationKernel */ public void setIntField( final Class c, final String n, final Object o, final int v ) { final Field field = getAccessibleField( c, n ); try { field.setInt( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } /** * @see DeserializationKernel */ public void setLongField( final Class c, final String n, final Object o, final long v ) { final Field field = getAccessibleField( c, n ); try { field.setLong( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } /** * @see DeserializationKernel */ public void setFloatField( final Class c, final String n, final Object o, final float v ) { final Field field = getAccessibleField( c, n ); try { field.setFloat( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } /** * @see DeserializationKernel */ public void setDoubleField( final Class c, final String n, final Object o, final double v ) { final Field field = getAccessibleField( c, n ); try { field.setDouble( o, v ); } catch ( final IllegalAccessException e ) { throw ExceptionTool.initCause( new Error( "Invocation not allowed! (" + e + ")" ), e ); } } } Index: LazyInitDeserializationKernel.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/orb/rmi/LazyInitDeserializationKernel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- LazyInitDeserializationKernel.java 14 Nov 2004 21:38:35 -0000 1.1 +++ LazyInitDeserializationKernel.java 28 Feb 2005 10:08:45 -0000 1.2 @@ -11,85 +11,89 @@ /** * A DeserializationKernel that delegates all operations to another kernel, * the delegate is created on demand. + * + * @version $Revision$ $Date$ * @author lkuehne + * @author Richard G Clark */ -class LazyInitDeserializationKernel implements DeserializationKernel +final class LazyInitDeserializationKernel implements DeserializationKernel { - private DeserializationKernel m_delegate = null; - private final String m_delegateShortName; + private static String s_delegateShortName; - LazyInitDeserializationKernel( String delegateShortName ) + LazyInitDeserializationKernel() { - m_delegateShortName = delegateShortName; } - private synchronized void ensureDelegateInitialized() + static synchronized void setDelegateName( final String delegateName ) { - if ( m_delegate == null ) - { - m_delegate = - DeserializationKernelFactory.createDeserializationKernel( m_delegateShortName ); - } + s_delegateShortName = delegateName; } - public Object allocateNewObject( Class c, Class base ) + private static synchronized String getDelegateName() + { + return s_delegateShortName; + } + + private static final class SINGLETON + { + static final DeserializationKernel VALUE + = DeserializationKernelFactory.createDeserializationKernel( getDelegateName() ); + } + + private static DeserializationKernel getKernel() + { + return SINGLETON.VALUE; + } + + + public Object allocateNewObject( final Class c, final Class base ) throws InstantiationException, IllegalAccessException { - ensureDelegateInitialized(); - return m_delegate.allocateNewObject( c, base ); + return getKernel().allocateNewObject( c, base ); } - public void setObjectField( Class c, String n, Object o, Object v ) + public void setObjectField( final Class c, final String n, final Object o, final Object v ) { - ensureDelegateInitialized(); - m_delegate.setObjectField( c, n, o, v ); + getKernel().setObjectField( c, n, o, v ); } - public void setBooleanField( Class c, String n, Object o, boolean v ) + public void setBooleanField( final Class c, final String n, final Object o, final boolean v ) { - ensureDelegateInitialized(); - m_delegate.setBooleanField( c, n, o, v ); + getKernel().setBooleanField( c, n, o, v ); } - public void setByteField( Class c, String n, Object o, byte v ) + public void setByteField( final Class c, final String n, final Object o, final byte v ) { - ensureDelegateInitialized(); - m_delegate.setByteField( c, n, o, v ); + getKernel().setByteField( c, n, o, v ); } - public void setCharField( Class c, String n, Object o, char v ) + public void setCharField( final Class c, final String n, final Object o, final char v ) { - ensureDelegateInitialized(); - m_delegate.setCharField( c, n, o, v ); + getKernel().setCharField( c, n, o, v ); } - public void setShortField( Class c, String n, Object o, short v ) + public void setShortField( final Class c, final String n, final Object o, final short v ) { - ensureDelegateInitialized(); - m_delegate.setShortField( c, n, o, v ); + getKernel().setShortField( c, n, o, v ); } - public void setIntField( Class c, String n, Object o, int v ) + public void setIntField( final Class c, final String n, final Object o, final int v ) { - ensureDelegateInitialized(); - m_delegate.setIntField( c, n, o, v ); + getKernel().setIntField( c, n, o, v ); } - public void setLongField( Class c, String n, Object o, long v ) + public void setLongField( final Class c, final String n, final Object o, final long v ) { - ensureDelegateInitialized(); - m_delegate.setLongField( c, n, o, v ); + getKernel().setLongField( c, n, o, v ); } - public void setFloatField( Class c, String n, Object o, float v ) + public void setFloatField( final Class c, final String n, final Object o, final float v ) { - ensureDelegateInitialized(); - m_delegate.setFloatField( c, n, o, v ); + getKernel().setFloatField( c, n, o, v ); } - public void setDoubleField( Class c, String n, Object o, double v ) + public void setDoubleField( final Class c, final String n, final Object o, final double v ) { - ensureDelegateInitialized(); - m_delegate.setDoubleField( c, n, o, v ); + getKernel().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.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- DeserializationKernelFactory.java 14 Nov 2004 21:38:35 -0000 1.8 +++ DeserializationKernelFactory.java 28 Feb 2005 10:08:45 -0000 1.9 @@ -30,6 +30,7 @@ * * Vendor: Sun Microsystems (http://java.sun.com) * <ul> + * <li>All, JDK 1.5.0 * <li>Windows 2000, JDK 1.3.0 * <li>Windows 2000, JDK 1.3.1 * <li>Windows 2000, JDK 1.4.0 @@ -103,8 +104,11 @@ if ( s_deserializationEngine.startsWith( LAZY_PREFIX ) && s_deserializationEngine.length() > LAZY_PREFIX.length() ) { - String delegateShortName = s_deserializationEngine.substring( LAZY_PREFIX.length() ); - s_kernel = new LazyInitDeserializationKernel( delegateShortName ); + final String delegateShortName + = s_deserializationEngine.substring( LAZY_PREFIX.length() ); + + LazyInitDeserializationKernel.setDelegateName( delegateShortName ); + s_kernel = new LazyInitDeserializationKernel(); } else { @@ -139,6 +143,11 @@ private static DeserializationKernel createAutoDeserializationKernel() { + if ( DeserializationKernelSun15.isSupportedPlatform() ) + { + return new DeserializationKernelSun15(); + } + try { Thread.currentThread().getContextClassLoader().loadClass( |
|
From: Richard G C. <pim...@us...> - 2005-02-28 10:09:05
|
Update of /cvsroot/openorb/OpenORB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12511/OpenORB Modified Files: WHATSNEW Log Message: - Implemented a deserialization kernel for Java 1.5 (Sun). As the reflection API has been enhanced to allow final fields to be set by setting the accessible property on the field object, the only remaining vendor specific hack is for the creation of Serializable objects where an object has to be created using the no-arg constructor of the first non Serializable super class. The current implementation uses the package local ObjectStreamClass.newInstance() method (via reflection) for this purpose. This kernel should work on all 1.5 platforms which provide this method. - Reimplemented LazyInitDeserializationKernel to use a thread safe lockless lazy singleton to remove the need to synchronize all calls. Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v retrieving revision 1.233 retrieving revision 1.234 diff -u -d -r1.233 -r1.234 --- WHATSNEW 26 Jan 2005 16:52:02 -0000 1.233 +++ WHATSNEW 28 Feb 2005 10:08:46 -0000 1.234 @@ -1,6 +1,18 @@ OpenORB ------- +- Implemented a deserialization kernel for Java 1.5 (Sun). As the reflection + API has been enhanced to allow final fields to be set by setting the + accessible property on the field object, the only remaining vendor specific + hack is for the creation of Serializable objects where an object has to be + created using the no-arg constructor of the first non Serializable super + class. The current implementation uses the package local + ObjectStreamClass.newInstance() method (via reflection) for this purpose. + This kernel should work on all 1.5 platforms which provide this method. + +- Reimplemented LazyInitDeserializationKernel to use a thread safe lockless + lazy singleton to remove the need to synchronize all calls. + - removed reference to the JDK tools.jar from build.xml to allow compilation on OSX |
|
From: <lk...@us...> - 2005-02-24 10:34:49
|
Update of /cvsroot/openorb/NotificationService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7605 Modified Files: WHATSNEW Log Message: notify.resourcesTimeout didn't work when both Events and Connections were reliable. Fix submitted by Eddie Lim Po. Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/NotificationService/WHATSNEW,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- WHATSNEW 25 Jan 2005 21:15:37 -0000 1.68 +++ WHATSNEW 24 Feb 2005 10:34:41 -0000 1.69 @@ -1,6 +1,9 @@ OpenORB NotificationService --------------------------- +- notify.resourcesTimeout didn't work when both Events and + Connections were reliable. Fix submitted by Eddie Lim Po. + - removed reference to the JDK tools.jar from build.xml to allow compilation on OSX |
|
From: <lk...@us...> - 2005-02-24 10:34:49
|
Update of /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/queue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7605/src/main/org/openorb/notify/queue Modified Files: Pusher.java Log Message: notify.resourcesTimeout didn't work when both Events and Connections were reliable. Fix submitted by Eddie Lim Po. Index: Pusher.java =================================================================== RCS file: /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/queue/Pusher.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Pusher.java 10 Dec 2004 16:15:25 -0000 1.27 +++ Pusher.java 24 Feb 2005 10:34:41 -0000 1.28 @@ -375,18 +375,11 @@ if ( m_firstDeliveryFailureTime > 0 ) { // a first-delivery-failure time has been set - final long failurePeriod = - System.currentTimeMillis() - m_firstDeliveryFailureTime; + boolean isProxyDisconnected = + disconnectProxyOnFailureTimeout( proxyId ); - if ( failurePeriod > m_disconnectOnFailureTimeout ) + if ( isProxyDisconnected ) { - // too much time has elapsed; disconnect client - getLogger().error( - "event delivery has failed for " - + failurePeriod + " milliseconds, disconnecting consumer " - + proxyId ); - m_proxy.reportClientDisconnection(); - setRunning( false ); return true; } } @@ -457,7 +450,24 @@ catch ( final SystemException _se ) { getLogger().debug( "push consumer still unavailable", _se ); - // retry in next loop + + if ( m_firstDeliveryFailureTime > 0 ) + { + boolean isProxyDisconnected = + disconnectProxyOnFailureTimeout( proxyId ); + + if ( isProxyDisconnected ) + { + return true; + } + } + else + { + // this is the first delivery failure (since the last + // successful delivery, if any); save the current time + m_firstDeliveryFailureTime = System.currentTimeMillis(); + } + // timeout hasn't been reached, retry in next loop } catch ( final InterruptedException ie ) { @@ -505,6 +515,30 @@ } /** + * Disconnect the proxy if failure timeout has been reached + * @param proxyId the proxy Id, used only for logging - provided + * to avoid recalculation of m_proxy.getId() + * @return true iff the proxy has been disconnected + */ + private boolean disconnectProxyOnFailureTimeout( final String proxyId ) + { + final long failurePeriod = System.currentTimeMillis() - m_firstDeliveryFailureTime; + + if ( failurePeriod > m_disconnectOnFailureTimeout ) + { + // too much time has elapsed; disconnect client + getLogger().error( + "event delivery has failed for " + + failurePeriod + " milliseconds, disconnecting consumer " + + proxyId ); + m_proxy.reportClientDisconnection(); + setRunning( false ); + return true; + } + return false; + } + + /** * This method sets a consumer */ public void setConsumer( final ConsumerAdapter consumer ) |
|
From: <lk...@us...> - 2005-02-24 07:43:47
|
Update of /cvsroot/openorb/tools/src/main/org/openorb/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29832/src/main/org/openorb/util Modified Files: MergeStack.java Log Message: Fixed NPE in MergeStack Index: MergeStack.java =================================================================== RCS file: /cvsroot/openorb/tools/src/main/org/openorb/util/MergeStack.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- MergeStack.java 11 Feb 2004 12:20:50 -0000 1.4 +++ MergeStack.java 24 Feb 2005 07:43:33 -0000 1.5 @@ -427,7 +427,11 @@ { m_next = next; } - m_next.m_prev = this; + + if ( m_next != null ) + { + m_next.m_prev = this; + } } } |
|
From: <lk...@us...> - 2005-02-24 07:43:47
|
Update of /cvsroot/openorb/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29832 Modified Files: WHATSNEW Log Message: Fixed NPE in MergeStack Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/tools/WHATSNEW,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- WHATSNEW 26 Jan 2005 17:00:44 -0000 1.82 +++ WHATSNEW 24 Feb 2005 07:43:33 -0000 1.83 @@ -1,6 +1,8 @@ OpenORB tools ------------- +- Fixed NPE in MergeStack + - removed reference to the JDK tools.jar from build.xml to allow compilation on OSX |
|
From: <lk...@us...> - 2005-01-26 17:06:14
|
Update of /cvsroot/openorb/TransactionService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21484 Modified Files: WHATSNEW Log Message: removed obsolete ref to JDK tools.jar to allow compilation on Mac OSX Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/TransactionService/WHATSNEW,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- WHATSNEW 13 Dec 2004 10:42:09 -0000 1.38 +++ WHATSNEW 26 Jan 2005 17:06:05 -0000 1.39 @@ -1,6 +1,9 @@ OpenORB TransactionService -------------------------- +- removed reference to the JDK tools.jar from build.xml + to allow compilation on OSX + - Fixed memory leak that was caused by activating a few CORBA objects per transaction in the RootPOA via calls to _this(). Those entries were then never removed from the AOM of the RootPOA. |
|
From: <lk...@us...> - 2005-01-26 17:06:14
|
Update of /cvsroot/openorb/TransactionService/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21484/src Modified Files: build.xml Log Message: removed obsolete ref to JDK tools.jar to allow compilation on Mac OSX Index: build.xml =================================================================== RCS file: /cvsroot/openorb/TransactionService/src/build.xml,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- build.xml 27 Jul 2004 13:12:37 -0000 1.64 +++ build.xml 26 Jan 2005 17:06:05 -0000 1.65 @@ -100,7 +100,6 @@ <fileset dir="${tools.dir}"> <include name="lib/ext/build/**/*.jar"/> </fileset> - <pathelement path="${java.home}/../lib/tools.jar" /> </path> |
|
From: <lk...@us...> - 2005-01-26 17:02:59
|
Update of /cvsroot/openorb/TradingService/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20500/src Modified Files: build.xml Log Message: removed obsolete ref to JDK tools.jar to allow compilation on Mac OSX Index: build.xml =================================================================== RCS file: /cvsroot/openorb/TradingService/src/build.xml,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- build.xml 23 Jul 2004 09:49:36 -0000 1.64 +++ build.xml 26 Jan 2005 17:02:47 -0000 1.65 @@ -106,7 +106,6 @@ <fileset dir="${tools.dir}"> <include name="lib/ext/build/**/*.jar"/> </fileset> - <pathelement path="${java.home}/../lib/tools.jar" /> </path> |
|
From: <lk...@us...> - 2005-01-26 17:02:55
|
Update of /cvsroot/openorb/TradingService In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20500 Modified Files: WHATSNEW Log Message: removed obsolete ref to JDK tools.jar to allow compilation on Mac OSX Index: WHATSNEW =================================================================== RCS file: /cvsroot/openorb/TradingService/WHATSNEW,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- WHATSNEW 19 Nov 2004 22:36:04 -0000 1.39 +++ WHATSNEW 26 Jan 2005 17:02:46 -0000 1.40 @@ -1,6 +1,9 @@ OpenORB TradingService ---------------------- +- removed reference to the JDK tools.jar from build.xml + to allow compilation on OSX + - Renamed "enum" variables to allow compilation on JDK 1.5 Version 1.4.0 BETA2 - July, 29 2004 - TradingService_1_4_0_BETA2 |
2 messages has been excluded from this view by a project administrator.
