You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/09 02:59:14 UTC
cvs commit: avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl EngineClassLoader.java
mcconnell 2003/06/08 17:59:14
Modified: merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
EngineClassLoader.java
Log:
Resolved a possible swallowing of an exception.
Revision Changes Path
1.6 +21 -10 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java
Index: EngineClassLoader.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EngineClassLoader.java 8 May 2003 03:02:39 -0000 1.5
+++ EngineClassLoader.java 9 Jun 2003 00:59:14 -0000 1.6
@@ -444,7 +444,8 @@
+ this + " due to undeclared system path.";
getLogger().warn( warning );
}
- } else
+ }
+ else
{
if( m_home != null )
{
@@ -530,7 +531,8 @@
ExtensionManager root = parent.getExtensionManager();
m_extensions = new DelegatingExtensionManager(
new ExtensionManager[]{local, root} );
- } else
+ }
+ else
{
m_extensions = new DefaultExtensionManager( files );
}
@@ -584,15 +586,15 @@
try
{
addClasspath( m_classpath );
- } catch( Throwable e )
+ }
+ catch( Throwable e )
{
final String error = REZ.getString( "error.classpath" );
throw new EngineException( error, e );
}
-
//
- // load the explicit URLs
+ // load the explicit URLs declared under the constructor
//
for( int i = 0; i < m_urls.length; i++ )
@@ -803,7 +805,8 @@
}
}
return;
- } catch( Throwable e )
+ }
+ catch( Throwable e )
{
final String error = REZ.getString( "classpath.expand.error" );
throw new EngineRuntimeException( error, e );
@@ -833,15 +836,23 @@
{
URL target = ext.toURL();
addURL( target );
- } catch( Throwable e )
+ }
+ catch( Throwable e )
{
final String error = REZ.getString( "add.ext.error", ext );
throw new EngineRuntimeException( error, e );
}
}
- } catch( Throwable e )
+ }
+ catch( EngineRuntimeException e )
{
- // error will be captured when we invoke addURL
+ throw e;
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Unexpected error while attempting to add extensions declared in url: " + url;
+ throw new EngineRuntimeException( error, e );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org