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

WW-5449 Minor clean up

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2024-07-26 19:28:12 +10:00
parent 015544abda
commit 902dca06ca
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+12 -13
View File
@@ -208,25 +208,24 @@ public class VelocityManager implements VelocityManagerInterface {
*/
private void applyUserConfiguration(ServletContext context, Properties properties) {
String configFile = requireNonNullElse(customConfigFile, "velocity.properties").trim();
boolean isLoaded = false;
try {
isLoaded = loadFile(properties, context.getRealPath(configFile));
if (loadFile(properties, context.getRealPath(configFile))) {
return;
}
} catch (IOException e) {
LOG.warn("Unable to load Velocity configuration from servlet context path", e);
}
if (!isLoaded) {
try {
isLoaded = loadFile(properties, context.getRealPath("/WEB-INF/" + configFile));
} catch (IOException e) {
LOG.warn("Unable to load Velocity configuration from WEB-INF path", e);
try {
if (loadFile(properties, context.getRealPath("/WEB-INF/" + configFile))) {
return;
}
} catch (IOException e) {
LOG.warn("Unable to load Velocity configuration from WEB-INF path", e);
}
if (!isLoaded) {
try {
isLoaded = loadClassPathFile(properties, configFile);
} catch (IOException e) {
LOG.warn("Unable to load Velocity configuration from classpath", e);
}
try {
loadClassPathFile(properties, configFile);
} catch (IOException e) {
LOG.warn("Unable to load Velocity configuration from classpath", e);
}
}