diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 12:56:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 12:56:44 +0000 |
| commit | 21b3b93f8ca67a783fac96d29908a6ebbc4fef15 (patch) | |
| tree | a90ff5c5144557d20f0a6641c4b32f717777b3f7 | |
| parent | b3c6fab047bda802fdacf7566de93e2da1cedb1f (diff) | |
INTEGRATION: CWS scriptingf6 (1.4.2); FILE MERGED
2004/10/21 13:18:03 toconnor 1.4.2.1: #i35609# fix crash when loading library that does not contain
a parcel-desciptor.xml file
| -rw-r--r-- | scripting/java/com/sun/star/script/framework/container/ParcelContainer.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java index 612b527297d9..e13653308378 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java @@ -2,9 +2,9 @@ * * $RCSfile: ParcelContainer.java,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2004-07-23 13:58:38 $ + * last change: $Author: rt $ $Date: 2004-10-22 13:56:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -431,7 +431,16 @@ public class ParcelContainer implements XNameAccess // TODO remove this once ucb workarounds are removed if ( !children[ i ].endsWith("this_is_a_dummy_stream_just_there_as_a_workaround_for_a_temporary_limitation_of_the_storage_api_implementation" ) ) { - loadParcel( children[ i ] ); + try + { + loadParcel( children[ i ] ); + } + catch (java.lang.Exception e) + { + // print an error message and move on to + // the next parcel + LogUtils.DEBUG("ParcelContainer.loadParcels caught " + e.getClass().getName() + " exception loading parcel " + children[i] + ": " + e.getMessage() ); + } } } } @@ -545,7 +554,6 @@ public class ParcelContainer implements XNameAccess } else { - LogUtils.DEBUG( parcelDescUrl + " does NOT exist!" ); throw new java.io.IOException( parcelDescUrl + " does NOT exist!"); } } @@ -557,8 +565,7 @@ public class ParcelContainer implements XNameAccess } catch ( java.io.IOException e ) { - - LogUtils.DEBUG("loadParcel() Exception while accessing filesystem url = " + parcelDescUrl + e ); + LogUtils.DEBUG("ParcelContainer.loadParcel() caught IOException while accessing " + parcelDescUrl + ": " + e ); throw new com.sun.star.lang.WrappedTargetException( e.toString() ); } catch ( com.sun.star.uno.Exception e ) |