Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put timeout on read lock used by web server - make sure it can't be indefinite

Browse source
This commit is contained in:
Mike Primm 2011-06-28 22:33:11 -05:00
parent 48fea32500
commit 2863dd0acc
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/dynmap/web/handlers/FilesystemHandler.java
View file

@ -23,7 +23,10 @@ public class FilesystemHandler extends FileHandler {
@Override
protected InputStream getFileInput(String path, HttpRequest request, HttpResponse response) {
File file = new File(root, path);
FileLockManager.getReadLock(file);
if(!FileLockManager.getReadLock(file, 5000)) { /* Wait up to 5 seconds for lock */
Log.severe("Timeout waiting for lock on file " + file.getPath());
return null;
}
FileInputStream result = null;
try {
if (file.getCanonicalPath().startsWith(root.getAbsolutePath()) && file.isFile()) {