From b084107c9af548804c526711b4e49e1b65c82f7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 21 Sep 2012 12:50:34 +0200 Subject: [PATCH] =?utf8?q?Use=20a=20project=E2=80=99s=20=E2=80=9Calways=20?= =?utf8?q?force=20insert=E2=80=9D=20setting=20when=20inserting=20the=20pro?= =?utf8?q?ject.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/java/de/todesbaum/jsite/application/ProjectInserter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java index ed06533..30d4d7a 100644 --- a/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java +++ b/src/main/java/de/todesbaum/jsite/application/ProjectInserter.java @@ -324,7 +324,7 @@ public class ProjectInserter implements FileScannerListener, Runnable { if (fileOption.isInsert()) { fileOption.setCurrentHash(file.getHash()); /* check if file was modified. */ - if (!fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) { + if (!project.isAlwaysForceInsert() && !fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) { /* only insert a redirect. */ logger.log(Level.FINE, String.format("Inserting redirect to edition %d for %s.", fileOption.getLastInsertEdition(), filename)); return new RedirectFileEntry(fileOption.hasChangedName() ? fileOption.getChangedName() : filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + fileOption.getLastInsertFilename()); -- 2.7.4