[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 5462cf0e56 Remove unnecessary code
5462cf0e56 is described below
commit 5462cf0e569d62a9f3949800d14ec343d4766a0a
Author: Mark Thomas
AuthorDate: Tue Oct 24 21:42:44 2023 +0100
Remove unnecessary code
---
java/org/apache/catalina/filters/CorsFilter.java| 2 +-
java/org/apache/catalina/manager/StatusTransformer.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 1aec15a43f..d6e294a1b7 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -324,7 +324,7 @@ public class CorsFilter extends GenericFilter {
if (!isAnyOriginAllowed()) {
// If only specific origins are allowed, the response will vary by
// origin
-ResponseUtil.addVaryFieldName(response,
CorsFilter.REQUEST_HEADER_ORIGIN);
+ResponseUtil.addVaryFieldName(response, REQUEST_HEADER_ORIGIN);
}
// Let request pass.
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java
b/java/org/apache/catalina/manager/StatusTransformer.java
index 50761f0d1a..4dc1b210c0 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -348,8 +348,8 @@ public class StatusTransformer {
}
String name = objectName.getKeyProperty("name");
// use StatusTransformer to output status
-StatusTransformer.writeConnectorState(writer, objectName, name,
mBeanServer, globalRequestProcessors,
-requestProcessors, mode, args);
+writeConnectorState(
+writer, objectName, name, mBeanServer,
globalRequestProcessors, requestProcessors, mode, args);
}
if (mode == 2) {
writer.append(']').println();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 658a7c8c07 Remove unnecessary code
658a7c8c07 is described below
commit 658a7c8c07a9c52313a8bf75c9e53d321cb6f801
Author: Mark Thomas
AuthorDate: Wed Aug 16 10:45:59 2023 +0100
Remove unnecessary code
---
test/org/apache/catalina/connector/TestRequest.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index 2bf2d801d0..e9c3b7cba0 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -85,8 +85,6 @@ public class TestRequest extends TomcatBaseTest {
client.doRequest(1, false); // 1 byte - too small should fail
Assert.assertTrue(client.isResponse413());
-client.reset();
-
// Edge cases around actual content length
client.reset();
client.doRequest(6, false); // Too small should fail
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code - coyoteRequest cannot be null
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 646962853a Remove unnecessary code - coyoteRequest cannot be null
646962853a is described below
commit 646962853a3baa893c70414dcd15390c298b8be2
Author: Mark Thomas
AuthorDate: Thu Aug 10 09:17:33 2023 +0100
Remove unnecessary code - coyoteRequest cannot be null
---
java/org/apache/catalina/connector/InputBuffer.java | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/connector/InputBuffer.java
b/java/org/apache/catalina/connector/InputBuffer.java
index 00a95a8620..739507a0ea 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -301,9 +301,6 @@ public class InputBuffer extends Reader implements
ByteChunk.ByteInputChannel, A
if (closed) {
return -1;
}
-if (coyoteRequest == null) {
-return -1;
-}
if (state == INITIAL_STATE) {
state = BYTE_STATE;
@@ -531,10 +528,7 @@ public class InputBuffer extends Reader implements
ByteChunk.ByteInputChannel, A
return;
}
-Charset charset = null;
-if (coyoteRequest != null) {
-charset = coyoteRequest.getCharset();
-}
+Charset charset = coyoteRequest.getCharset();
if (charset == null) {
charset = org.apache.coyote.Constants.DEFAULT_BODY_CHARSET;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 1e9b8fcef3 Remove unnecessary code
1e9b8fcef3 is described below
commit 1e9b8fcef372bc50c9f2438f00187fbfca6aad74
Author: Mark Thomas
AuthorDate: Wed Jul 5 17:34:03 2023 +0100
Remove unnecessary code
Dead code identified by Coverity Scan
---
java/org/apache/coyote/http2/StreamProcessor.java | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index fd1e011bea..4b06ff9b71 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -506,17 +506,12 @@ class StreamProcessor extends AbstractProcessor {
}
// HTTP header names must be tokens.
+// Stream#emitHeader() checks that all the pseudo headers appear first.
MimeHeaders headers = request.getMimeHeaders();
-boolean previousHeaderWasPseudoHeader = true;
Enumeration names = headers.names();
while (names.hasMoreElements()) {
String name = names.nextElement();
-if (H2_PSEUDO_HEADERS_REQUEST.contains(name)) {
-if (!previousHeaderWasPseudoHeader) {
-return false;
-}
-} else if (!HttpParser.isToken(name)) {
-previousHeaderWasPseudoHeader = false;
+if (!H2_PSEUDO_HEADERS_REQUEST.contains(name) &&
!HttpParser.isToken(name)) {
return false;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code. pos is always updated again before next use
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 6fa8fd9b96 Remove unnecessary code. pos is always updated again before
next use
6fa8fd9b96 is described below
commit 6fa8fd9b963b14afe473fd664a3ef60e98b4190c
Author: Mark Thomas
AuthorDate: Tue Jul 4 22:02:40 2023 +0100
Remove unnecessary code. pos is always updated again before next use
---
java/org/apache/catalina/valves/rewrite/Substitution.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 2fa3e8d8a7..1e70de2fcd 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -163,7 +163,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, dollarPos);
-pos = dollarPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(dollarPos + 1))) {
@@ -215,7 +214,6 @@ public class Substitution {
// Static text
StaticElement newElement = new StaticElement();
newElement.value = sub.substring(pos, percentPos);
-pos = percentPos;
elements.add(newElement);
}
if (Character.isDigit(sub.charAt(percentPos + 1))) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2630fcbae0 Remove unnecessary code
2630fcbae0 is described below
commit 2630fcbae089f1f74438247214d4fe622f610545
Author: Mark Thomas
AuthorDate: Tue Nov 8 11:41:41 2022 +
Remove unnecessary code
The default async timeout is stored on the Connector and retrieved from
there by the request. The request then sets it on the Processor. It is
never used by the protocol or the endpoint.
---
java/org/apache/catalina/connector/Connector.java | 1 -
webapps/docs/changelog.xml| 4
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 9148495f0b..3066b33ab6 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -393,7 +393,6 @@ public class Connector extends LifecycleMBeanBase {
*/
public void setAsyncTimeout(long asyncTimeout) {
this.asyncTimeout= asyncTimeout;
-setProperty("asyncTimeout", String.valueOf(asyncTimeout));
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 346f510c47..76df264394 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -151,6 +151,10 @@
not to do so and remove checks for this return value. Based on
562 by tianshuang. (markt)
+
+Remove unnecessary code that exposed the asyncTimeout to
+components that never used it. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 216b75a7ef Remove unnecessary code
216b75a7ef is described below
commit 216b75a7eff8367a4678329f631b4722311a324b
Author: Mark Thomas
AuthorDate: Wed Sep 21 16:17:40 2022 +0100
Remove unnecessary code
---
java/org/apache/catalina/manager/util/BaseSessionComparator.java | 7 ---
1 file changed, 7 deletions(-)
diff --git a/java/org/apache/catalina/manager/util/BaseSessionComparator.java
b/java/org/apache/catalina/manager/util/BaseSessionComparator.java
index d13289927c..30f674ae0e 100644
--- a/java/org/apache/catalina/manager/util/BaseSessionComparator.java
+++ b/java/org/apache/catalina/manager/util/BaseSessionComparator.java
@@ -29,13 +29,6 @@ import org.apache.catalina.Session;
*/
public abstract class BaseSessionComparator implements Comparator {
-/**
- *
- */
-public BaseSessionComparator() {
-super();
-}
-
public abstract Comparable getComparableObject(Session session);
/* (non-Javadoc)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4567a4075e Remove unnecessary code
4567a4075e is described below
commit 4567a4075e43652fe3a6e78fbedc26970d918d5b
Author: Mark Thomas
AuthorDate: Mon May 23 12:12:11 2022 +0100
Remove unnecessary code
---
java/org/apache/catalina/core/StandardThreadExecutor.java | 12
1 file changed, 12 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardThreadExecutor.java
b/java/org/apache/catalina/core/StandardThreadExecutor.java
index 6e18c61852..9d83c51f35 100644
--- a/java/org/apache/catalina/core/StandardThreadExecutor.java
+++ b/java/org/apache/catalina/core/StandardThreadExecutor.java
@@ -96,12 +96,6 @@ public class StandardThreadExecutor extends
LifecycleMBeanBase
// -- Public Methods
-@Override
-protected void initInternal() throws LifecycleException {
-super.initInternal();
-}
-
-
/**
* Start the component and implement the requirements
* of {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
@@ -141,12 +135,6 @@ public class StandardThreadExecutor extends
LifecycleMBeanBase
}
-@Override
-protected void destroyInternal() throws LifecycleException {
-super.destroyInternal();
-}
-
-
@Override
@Deprecated
public void execute(Runnable command, long timeout, TimeUnit unit) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e2624ac Remove unnecessary code
e2624ac is described below
commit e2624ac20bee1f1549109922ad7bc8d4ea80c6ed
Author: Mark Thomas
AuthorDate: Tue May 11 21:49:07 2021 +0100
Remove unnecessary code
This method is called for a SimpleTag.
pushBodyCountVar is always null for SimpleTag as the code where it is
set in visit(CustomTag) is never called if n.implementsSimpleTag() is
true.
---
java/org/apache/jasper/compiler/Generator.java | 4
webapps/docs/changelog.xml | 8
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index b6e0cd5..ba36ffe 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3313,10 +3313,6 @@ class Generator {
boolean tmpIsFragment = isFragment;
isFragment = true;
String pushBodyCountVarSave = pushBodyCountVar;
-if (pushBodyCountVar != null) {
-// Use a fixed name for push body count, to simplify code gen
-pushBodyCountVar = "_jspx_push_body_count";
-}
visitBody(n);
out = outSave;
parent = tmpParent;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3a6a78c..dc1bd17 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Review code used to generate Java source from JSPs and tags and remove
+code found to be unnecessary. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code. parent is always non-null
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b74ac4f Remove unnecessary code. parent is always non-null
b74ac4f is described below
commit b74ac4f36a492f4a1dc84919d0ac64de09aec650
Author: Mark Thomas
AuthorDate: Thu Apr 8 17:54:47 2021 +0100
Remove unnecessary code. parent is always non-null
---
java/org/apache/jasper/compiler/Generator.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 389159f..3570e57 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1117,12 +1117,9 @@ class Generator {
* a Named Attribute (jsp:attribute), generate the code to
evaluate
* those bodies first.
*
- * If parent is null, simply returns.
+ * {@code parent} is assumed to be non-null
*/
private void prepareParams(Node parent) throws JasperException {
-if (parent == null)
-return;
-
Node.Nodes subelements = parent.getBody();
if (subelements != null) {
for (int i = 0; i < subelements.size(); i++) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2628a9b Remove unnecessary code
2628a9b is described below
commit 2628a9b331b9b1ce220c6b17eb48c600f6e76647
Author: Mark Thomas
AuthorDate: Thu Apr 8 15:50:25 2021 +0100
Remove unnecessary code
Node.ELExpression instances are not created if pageInfo.isELIgnored is
true. It seems likely this code predates the refactoring (many years
ago) that switched to parsing in two passes. The first pass parses just
the directives. The second parses everything given on the basis of the
directives found in the first pass.
---
java/org/apache/jasper/compiler/Generator.java | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 43068f4..389159f 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1064,16 +1064,12 @@ class Generator {
@Override
public void visit(Node.ELExpression n) throws JasperException {
n.setBeginJavaLine(out.getJavaLine());
-if (!pageInfo.isELIgnored() && (n.getEL() != null)) {
-out.printil("out.write("
-+ elInterpreter.interpreterCall(ctxt, this.isTagFile,
-n.getType() + "{" + n.getText() + "}",
-String.class, n.getEL().getMapName()) +
-");");
-} else {
-out.printil("out.write("
-+ quote(n.getType() + "{" + n.getText() + "}") + ");");
-}
+System.out.println("[" + pageInfo.isELIgnored() + "] [" +
n.getEL() + "]");
+out.printil("out.write("
++ elInterpreter.interpreterCall(ctxt, this.isTagFile,
+n.getType() + "{" + n.getText() + "}",
+String.class, n.getEL().getMapName()) +
+");");
n.setEndJavaLine(out.getJavaLine());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new d40b06c Remove unnecessary code.
d40b06c is described below
commit d40b06c70b01ae78a3313e8d7d563d536e40a7e2
Author: Mark Thomas
AuthorDate: Tue Mar 2 10:53:26 2021 +
Remove unnecessary code.
If t == null this code has no effect
If t != null it is re-added in asyncConImpl.setErrorState
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 01216f2..b03b688 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -152,7 +152,6 @@ public class CoyoteAdapter implements Adapter {
// trigger a close
success = false;
Throwable t =
(Throwable)req.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
-req.getAttributes().remove(RequestDispatcher.ERROR_EXCEPTION);
Context context = request.getContext();
ClassLoader oldCL = null;
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new f056baa Remove unnecessary code
f056baa is described below
commit f056baa97638fca97cd5f19161fe4e6aea54eacf
Author: Mark Thomas
AuthorDate: Mon Nov 23 15:44:26 2020 +
Remove unnecessary code
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 7cdb8f3..159d55b 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -606,9 +606,7 @@ public class NioEndpoint extends
AbstractJsseEndpoint
int interestOps = pe.getInterestOps();
if (sc == null) {
log.warn(sm.getString("endpoint.nio.nullSocketChannel"));
-if (socketWrapper != null) {
-socketWrapper.close();
-}
+socketWrapper.close();
} else if (interestOps == OP_REGISTER) {
try {
sc.register(getSelector(), SelectionKey.OP_READ,
socketWrapper);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.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 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new f7ce847 Remove unnecessary code. This attribute will always be set.
f7ce847 is described below
commit f7ce8472149a92f1a2abdb49bddf64640d1a9295
Author: Mark Thomas
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 3129cdb..3636f62 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -662,17 +662,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
