X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=158a0bb1f9aa48ec707758f3b09c3bc7e22265ba;hb=676508d76c058279be144efdc58ae6d7a34db783;hp=a6e0e2178fe184c43fe6f0d2c9d92ffe4e60f7c3;hpb=cbb190627308fe9e426331aca0d121c75f701d5e;p=jSite.git diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java index a6e0e21..158a0bb 100644 --- a/src/de/todesbaum/jsite/application/ProjectInserter.java +++ b/src/de/todesbaum/jsite/application/ProjectInserter.java @@ -280,12 +280,13 @@ public class ProjectInserter implements FileScannerListener, Runnable { String filename = file.getFilename(); FileOption fileOption = project.getFileOption(filename); if (fileOption.isInsert()) { + fileOption.setCurrentHash(file.getHash()); /* check if file was modified. */ if (file.getHash().equals(fileOption.getLastInsertHash())) { /* only insert a redirect. */ - return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + project.getEdition() + "/" + filename); + logger.log(Level.FINE, String.format("Inserting redirect to edition %d for %s.", fileOption.getLastInsertEdition(), filename)); + return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + filename); } - fileOption.setCurrentHash(file.getHash()); try { long[] fileLength = new long[1]; InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength); @@ -375,7 +376,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { */ public void run() { fireProjectInsertStarted(); - List files = fileScanner.getFiles(); + List files = fileScanner.getFiles(); /* create connection to node */ synchronized (lockObject) {