Fixing ResourceCollection exists() and getInputStream()
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
parent
35305b6a5c
commit
c16b8f3a61
|
@ -19,6 +19,7 @@
|
||||||
package org.eclipse.jetty.util.resource;
|
package org.eclipse.jetty.util.resource;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
|
@ -281,7 +282,15 @@ public class ResourceCollection extends Resource
|
||||||
{
|
{
|
||||||
assertResourcesSet();
|
assertResourcesSet();
|
||||||
|
|
||||||
return true;
|
for (Resource r : _resources)
|
||||||
|
{
|
||||||
|
if (r.exists())
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -307,13 +316,19 @@ public class ResourceCollection extends Resource
|
||||||
|
|
||||||
for (Resource r : _resources)
|
for (Resource r : _resources)
|
||||||
{
|
{
|
||||||
|
if (!r.exists())
|
||||||
|
{
|
||||||
|
// Skip, cannot open anyway
|
||||||
|
continue;
|
||||||
|
}
|
||||||
InputStream is = r.getInputStream();
|
InputStream is = r.getInputStream();
|
||||||
if (is != null)
|
if (is != null)
|
||||||
{
|
{
|
||||||
return is;
|
return is;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
|
throw new FileNotFoundException("Resource does not exist");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue