[tomcat] 01/03: Revert "Fix failing test. There should be no C-L for HEAD unless Servlet sets it"

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 97d6ef12c09e52e43c2ddf0bb7cf9e6fc32b84b2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 25 14:00:57 2023 +0100

    Revert "Fix failing test. There should be no C-L for HEAD unless Servlet 
sets it"
    
    This reverts commit 7828614e36069ef1d08ad7eab36b4708bfaae9a2.
    The change that necessitated this change is also being reverted.
---
 test/org/apache/catalina/servlets/TestDefaultServlet.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/servlets/TestDefaultServlet.java 
b/test/org/apache/catalina/servlets/TestDefaultServlet.java
index dca67ff9cb..b67cc325d4 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServlet.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServlet.java
@@ -636,11 +636,10 @@ public class TestDefaultServlet extends TomcatBaseTest {
         String length = resHeaders.get("Content-Length").get(0);
         Assert.assertEquals(Long.parseLong(length), out.getLength());
         out.recycle();
-        resHeaders.clear();
 
         rc = headUrl(path, out, resHeaders);
         Assert.assertEquals(HttpServletResponse.SC_OK, rc);
         Assert.assertEquals(0, out.getLength());
-        Assert.assertNull(resHeaders.get("Content-Length"));
+        Assert.assertEquals(length, resHeaders.get("Content-Length").get(0));
     }
 }


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