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/07/03 21:03:52 UTC
cvs commit: avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl EngineClassLoader.java
mcconnell 2003/07/03 12:03:51
Modified: merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
EngineClassLoader.java
Log:
Correct an error in placement of the logging level test that would modify if an excepton was thrown or not.
Revision Changes Path
1.14 +22 -18 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- EngineClassLoader.java 3 Jul 2003 04:28:53 -0000 1.13
+++ EngineClassLoader.java 3 Jul 2003 19:03:51 -0000 1.14
@@ -1245,26 +1245,28 @@
final ArrayList unsatisfied = new ArrayList();
scanDependencies( required, available, dependencies, unsatisfied );
- if( (0 != unsatisfied.size()) && (getLogger().isWarnEnabled()) )
+ if( (0 != unsatisfied.size()) )
{
final int size = unsatisfied.size();
- for( int i = 0; i < size; i++ )
+ if( getLogger().isWarnEnabled() )
{
- final Extension extension = (Extension) unsatisfied.get( i );
- final Object[] params = new Object[]
+ for( int i = 0; i < size; i++ )
{
- extension.getExtensionName(),
- extension.getSpecificationVendor(),
- extension.getSpecificationVersion(),
- extension.getImplementationVendor(),
- extension.getImplementationVendorID(),
- extension.getImplementationVersion(),
- extension.getImplementationURL()
- };
- final String message = REZ.format( "missing.extension", params );
- getLogger().warn( message );
+ final Extension extension = (Extension) unsatisfied.get( i );
+ final Object[] params = new Object[]
+ {
+ extension.getExtensionName(),
+ extension.getSpecificationVendor(),
+ extension.getSpecificationVersion(),
+ extension.getImplementationVendor(),
+ extension.getImplementationVendorID(),
+ extension.getImplementationVersion(),
+ extension.getImplementationURL()
+ };
+ final String message = REZ.format( "missing.extension", params );
+ getLogger().warn( message );
+ }
}
-
final String message =
REZ.getString( "unsatisfied.extensions", new Integer( size ) );
throw new Exception( message );
@@ -1291,7 +1293,8 @@
if( element.startsWith( "jar:" ) )
{
url = new URL( element );
- } else
+ }
+ else
{
url = new URL( "jar:" + element + "!/" );
}
@@ -1299,7 +1302,8 @@
(JarURLConnection) url.openConnection();
final Manifest manifest = connection.getManifest();
manifests.add( manifest );
- } catch( final IOException ioe )
+ }
+ catch( final IOException ioe )
{
final String message =
REZ.getString( "bad-classpath-entry", element );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org