You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2002/07/05 05:43:13 UTC
cvs commit: jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider DefaultURLStreamHandler.java
donaldp 2002/07/04 20:43:13
Modified: aut/src/java/org/apache/aut/vfs/provider
DefaultURLStreamHandler.java
Log:
Avoid null pointer
Revision Changes Path
1.3 +6 -4 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLStreamHandler.java
Index: DefaultURLStreamHandler.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLStreamHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultURLStreamHandler.java 5 Jul 2002 03:21:54 -0000 1.2
+++ DefaultURLStreamHandler.java 5 Jul 2002 03:43:13 -0000 1.3
@@ -50,15 +50,17 @@
{
try
{
- FileObject old = null;
- if( u.getProtocol() != null )
- old = m_context.resolveFile( u.toExternalForm() );
+ FileObject old = m_context.resolveFile( u.toExternalForm() );
FileObject newURL = null;
if( start > 0 && spec.charAt( start - 1 ) == ':' )
+ {
newURL = m_context.resolveFile( old, spec );
+ }
else
+ {
newURL = old.resolveFile( spec );
+ }
final String url = newURL.getName().getURI();
final StringBuffer filePart = new StringBuffer();
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>