You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/06/04 17:01:27 UTC
[tomcat] branch 8.5.x updated: Remove unnecessary code. This
attribute will always be set.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 6d7e1a0 Remove unnecessary code. This attribute will always be set.
6d7e1a0 is described below
commit 6d7e1a00cd706654eca445989d85960cbfba83ac
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 4 17:47:23 2020 +0100
Remove unnecessary code. This attribute will always be set.
---
java/org/apache/jasper/EmbeddedServletOptions.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java
index 4ddce3c..19d9bba 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -670,17 +670,9 @@ public final class EmbeddedServletOptions implements Options {
if (dir != null) {
scratchDir = new File(dir);
} else {
- // First try the Servlet 2.2 javax.servlet.context.tempdir property
scratchDir = (File) context.getAttribute(ServletContext.TEMPDIR);
- if (scratchDir == null) {
- // Not running in a Servlet 2.2 container.
- // Try to get the JDK 1.2 java.io.tmpdir property
- dir = System.getProperty("java.io.tmpdir");
- if (dir != null)
- scratchDir = new File(dir);
- }
}
- if (this.scratchDir == null) {
+ if (scratchDir == null) {
log.fatal(Localizer.getMessage("jsp.error.no.scratch.dir"));
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org