Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3984 Reverts some changes from previous commit

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1447689 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-02-19 11:45:45 +00:00
parent 94c0a6cfdf
commit 9d20642ccc
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class DefaultFileManager implements FileManager {
LOG.debug("Creating revision for URL: " + fileName);
}
if (isJarURL(fileUrl)) {
revision = JarEntryRevision.build(normalizeToFileProtocol(fileUrl));
revision = JarEntryRevision.build(normalizeToFileProtocol(fileUrl), this);
} else {
revision = FileRevision.build(fileUrl);
}
xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java
+10 -4
View File
@@ -1,5 +1,6 @@
package com.opensymphony.xwork2.util.fs;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.commons.io.FileUtils;
@@ -23,7 +24,7 @@ public class JarEntryRevision extends Revision {
private String fileNameInJar;
private long lastModified;
public static Revision build(URL fileUrl) {
public static Revision build(URL fileUrl, FileManager fileManager) {
// File within a Jar
// Find separator index of jar filename and filename within jar
String jarFileName = "";
@@ -44,9 +45,14 @@ public class JarEntryRevision extends Revision {
int index = separatorIndex + JAR_FILE_NAME_SEPARATOR.length();
String fileNameInJar = fileName.substring(index).replaceAll("%20", " ");
JarFile jarFile = new JarFile(FileUtils.toFile(fileUrl));
ZipEntry entry = jarFile.getEntry(fileNameInJar);
return new JarEntryRevision(jarFileName, fileNameInJar, entry.getTime());
URL url = fileManager.normalizeToFileProtocol(fileUrl);
if (url != null) {
JarFile jarFile = new JarFile(FileUtils.toFile(url));
ZipEntry entry = jarFile.getEntry(fileNameInJar);
return new JarEntryRevision(jarFileName, fileNameInJar, entry.getTime());
} else {
return null;
}
} catch (Throwable e) {
if (LOG.isWarnEnabled()) {
LOG.warn("Could not create JarEntryRevision for [#0]!", e, jarFileName);