Skip to content

Commit b168782

Browse files
author
Vladimir Kotal
committed
refactor, add log
1 parent 4c692fb commit b168782

File tree

2 files changed

+33
-7
lines changed

2 files changed

+33
-7
lines changed

opengrok-web/src/main/java/org/opengrok/web/PageConfig.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,19 +1202,29 @@ private static String trailingSlash(String path) {
12021202
: "";
12031203
}
12041204

1205+
private File checkFileInner(File file, File dir, String name) {
1206+
File f = new File(dir, name);
1207+
if (f.exists() && f.isFile()) {
1208+
if (f.lastModified() >= file.lastModified()) {
1209+
return f;
1210+
} else {
1211+
LOGGER.log(Level.WARNING, "file ''{0}'' is newer than ''{1}''", new Object[]{file, f});
1212+
}
1213+
}
1214+
1215+
return null;
1216+
}
1217+
12051218
private File checkFile(File file, File dir, String name, boolean compressed) {
12061219
File f;
12071220
if (compressed) {
1208-
f = new File(dir, TandemPath.join(name, ".gz"));
1209-
if (f.exists() && f.isFile() && f.lastModified() >= file.lastModified()) {
1221+
f = checkFileInner(file, dir, TandemPath.join(name, ".gz"));
1222+
if (f != null) {
12101223
return f;
12111224
}
12121225
}
1213-
f = new File(dir, name);
1214-
if (f.exists() && f.isFile() && f.lastModified() >= file.lastModified()) {
1215-
return f;
1216-
}
1217-
return null;
1226+
1227+
return checkFileInner(file, dir, name);
12181228
}
12191229

12201230
private File checkFileResolve(File dir, String name, boolean compressed) {
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<%--
2+
Created by IntelliJ IDEA.
3+
User: vkotal
4+
Date: 06.04.21
5+
Time: 14:16
6+
To change this template use File | Settings | File Templates.
7+
--%>
8+
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
9+
<html>
10+
<head>
11+
<title>$Title$</title>
12+
</head>
13+
<body>
14+
$END$
15+
</body>
16+
</html>

0 commit comments

Comments
 (0)