Use last insert edition for redirect.

[jSite.git] / src / de / todesbaum / jsite / application / ProjectInserter.java

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index acd93db..9471175 100644 (file)
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -283,7 +283,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                        /* 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);
+                               return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + filename);
                        }
                        fileOption.setCurrentHash(file.getHash());
                        try {
@@ -375,7 +375,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
         */
        public void run() {
                fireProjectInsertStarted();
-               List<String> files = fileScanner.getFiles();
+               List<ScannedFile> files = fileScanner.getFiles();
 
                /* create connection to node */
                synchronized (lockObject) {
@@ -465,6 +465,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                        int newEdition = Integer.parseInt(editionPart);
                        project.setEdition(newEdition);
                        project.setLastInsertionTime(System.currentTimeMillis());
+                       project.copyHashes();
                }
                fireProjectInsertFinished(success, cancelled ? new AbortedException() : (disconnected ? new IOException("Connection terminated") : null));
        }