Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

423982 removed duplicate UrlResource toString

This commit is contained in:
Greg Wilkins 2014-03-21 12:56:42 +11:00
parent 116f6bc281
commit 367c43a7b3
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
View File

@ -211,19 +211,6 @@ class JarFileResource extends JarResource
break;
}
}
if (_directory && !_urlString.endsWith("/"))
{
_urlString+="/";
try
{
_url=new URL(_urlString);
}
catch(MalformedURLException ex)
{
LOG.warn(ex);
}
}
}
}

10
jetty-util/src/main/java/org/eclipse/jetty/util/resource/URLResource.java
View File

@ -37,8 +37,8 @@ import org.eclipse.jetty.util.log.Logger;
public class URLResource extends Resource
{
private static final Logger LOG = Log.getLogger(URLResource.class);
protected URL _url;
protected String _urlString;
protected final URL _url;
protected final String _urlString;
protected URLConnection _connection;
protected InputStream _in=null;
@ -48,7 +48,7 @@ public class URLResource extends Resource
protected URLResource(URL url, URLConnection connection)
{
_url = url;
_urlString=_url.toString();
_urlString=_url.toExternalForm();
_connection=connection;
}
@ -116,14 +116,14 @@ public class URLResource extends Resource
/* ------------------------------------------------------------ */
/**
* Returns true if the respresenetd resource is a container/directory.
* Returns true if the represented resource is a container/directory.
* If the resource is not a file, resources ending with "/" are
* considered directories.
*/
@Override
public boolean isDirectory()
{
return exists() && _url.toString().endsWith("/");
return exists() && _urlString.endsWith("/");
}