mcconnell 2003/09/09 06:03:20
Modified:
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultContainmentModel.java
Log:
Final tweak to verify against an unknown file type.
Revision Changes Path
1.5 +3 -1
avalon-sandbox/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultContainmentModel.java 9 Sep 2003 12:56:29 -0000 1.4
+++ DefaultContainmentModel.java 9 Sep 2003 13:03:20 -0000 1.5
@@ -663,6 +663,8 @@
}
else
{
+ verifyPath( path );
+
return createContainmentModel( name, new URL( path + "/" ) );
}
}
@@ -718,7 +720,7 @@
catch( java.io.FileNotFoundException e )
{
final String error =
- "Invalid path: " + path;
+ "File not found: " + path;
throw new ModelException( error );
}
catch( Throwable e )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]