29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From ad60947e42e666dc9c9d77315787ea9bb567e3fd Mon Sep 17 00:00:00 2001
|
|
From: Mark Thomas <markt@apache.org>
|
|
Date: Wed, 13 Mar 2019 11:18:45 +0000
|
|
Subject: [PATCH] Always process the docBase using absolute path during
|
|
deployment
|
|
|
|
Use absolute path to determine the Context name, deployment type,
|
|
whether the docBase is located within the appBase etc.
|
|
---
|
|
java/org/apache/catalina/startup/ContextConfig.java | 4 ++--
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
|
|
index ebd3d8221f..0c67af3bf4 100644
|
|
--- a/java/org/apache/catalina/startup/ContextConfig.java
|
|
+++ b/java/org/apache/catalina/startup/ContextConfig.java
|
|
@@ -582,9 +582,9 @@ protected void fixDocBase() throws IOException {
|
|
|
|
File file = new File(docBase);
|
|
if (!file.isAbsolute()) {
|
|
- docBase = (new File(appBase, docBase)).getCanonicalPath();
|
|
+ docBase = (new File(appBase, docBase)).getAbsolutePath();
|
|
} else {
|
|
- docBase = file.getCanonicalPath();
|
|
+ docBase = file.getAbsolutePath();
|
|
}
|
|
file = new File(docBase);
|
|
String origDocBase = docBase;
|