(tomcat) branch 9.0.x updated: Minor optimisation

[markt]

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 1aa97da1c2 Minor optimisation
1aa97da1c2 is described below

commit 1aa97da1c2bda3541c22fb6cee26a17dba1b3e0a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 12 18:17:35 2024 +0000

    Minor optimisation
    
    Doesn't make much difference on my local machine. Might help on CI
    systems where file access is often slower.
---
 ...efaultServletRfc9110Section13Parameterized.java | 43 ++++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git 
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
 
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
index 6f41db4eef..b8682eb287 100644
--- 
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
+++ 
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -470,30 +470,33 @@ public class 
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
                 StandardOpenOption.CREATE);
         (new File(tempDocBase.getAbsolutePath(), 
"index.html")).setLastModified(lastModified);
 
-        Files.write((new File(tempDocBase.getAbsolutePath(), 
"put_exist.txt")).toPath(), "put_exist_v0".getBytes(),
-                StandardOpenOption.CREATE);
-        (new File(tempDocBase.getAbsolutePath(), 
"put_exist.txt")).setLastModified(lastModified);
+        if (task.m.equals(HTTP_METHOD.PUT)) {
+            Files.write((new File(tempDocBase.getAbsolutePath(), 
"put_exist.txt")).toPath(), "put_exist_v0".getBytes(),
+                    StandardOpenOption.CREATE);
+            (new File(tempDocBase.getAbsolutePath(), 
"put_exist.txt")).setLastModified(lastModified);
+        }
 
-        Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist.txt")).toPath(), "delete_exist_v0".getBytes(),
-                StandardOpenOption.CREATE);
-        (new File(tempDocBase.getAbsolutePath(), 
"delete_exist.txt")).setLastModified(lastModified);
+        if (task.m.equals(HTTP_METHOD.DELETE)) {
+            Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist.txt")).toPath(), "delete_exist_v0".getBytes(),
+                    StandardOpenOption.CREATE);
+            (new File(tempDocBase.getAbsolutePath(), 
"delete_exist.txt")).setLastModified(lastModified);
 
-        Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist1.txt")).toPath(), "delete_exist1_v0".getBytes(),
-                StandardOpenOption.CREATE);
-        (new File(tempDocBase.getAbsolutePath(), 
"delete_exist1.txt")).setLastModified(lastModified);
+            Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist1.txt")).toPath(), "delete_exist1_v0".getBytes(),
+                    StandardOpenOption.CREATE);
+            (new File(tempDocBase.getAbsolutePath(), 
"delete_exist1.txt")).setLastModified(lastModified);
 
-        Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist2.txt")).toPath(), "delete_exist2_v0".getBytes(),
-                StandardOpenOption.CREATE);
-        (new File(tempDocBase.getAbsolutePath(), 
"delete_exist2.txt")).setLastModified(lastModified);
+            Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist2.txt")).toPath(), "delete_exist2_v0".getBytes(),
+                    StandardOpenOption.CREATE);
+            (new File(tempDocBase.getAbsolutePath(), 
"delete_exist2.txt")).setLastModified(lastModified);
 
-        Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist3.txt")).toPath(), "delete_exist3_v0".getBytes(),
-                StandardOpenOption.CREATE);
-        (new File(tempDocBase.getAbsolutePath(), 
"delete_exist3.txt")).setLastModified(lastModified);
-
-        Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist4.txt")).toPath(), "delete_exist4_v0".getBytes(),
-                StandardOpenOption.CREATE);
-        (new File(tempDocBase.getAbsolutePath(), 
"delete_exist4.txt")).setLastModified(lastModified);
+            Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist3.txt")).toPath(), "delete_exist3_v0".getBytes(),
+                    StandardOpenOption.CREATE);
+            (new File(tempDocBase.getAbsolutePath(), 
"delete_exist3.txt")).setLastModified(lastModified);
 
+            Files.write((new File(tempDocBase.getAbsolutePath(), 
"delete_exist4.txt")).toPath(), "delete_exist4_v0".getBytes(),
+                    StandardOpenOption.CREATE);
+            (new File(tempDocBase.getAbsolutePath(), 
"delete_exist4.txt")).setLastModified(lastModified);
+        }
     }
 
     @Test


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org