Merge + Fixing formatting

This commit is contained in:
Joakim Erdfelt 2017-05-30 13:14:49 -07:00
commit b318f1c6dd
1 changed files with 4 additions and 7 deletions

View File

@ -201,13 +201,10 @@ public class PathResource extends Resource
return path.toAbsolutePath().toString();
}
@Override
public String toString() {
// Note: The org.eclipse.jetty.server.ResourceCache.Content uses #toString() instead of
// #getName() for determining the file name for mime type resolution based on the file name
// extension.
return path.toString();
}
@Override
public String toString() {
return path.toString();
}
@Override
public ReadableByteChannel getReadableByteChannel() throws IOException