(freemarker) branch 2.3-gae updated: (Some random cleanup of recent servlet related changes)

[ddekany]

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

ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git


The following commit(s) were added to refs/heads/2.3-gae by this push:
     new f970eaa7 (Some random cleanup of recent servlet related changes)
f970eaa7 is described below

commit f970eaa7d2b430b9bf620af2df2d4ffaa05004c2
Author: ddekany <ddek...@apache.org>
AuthorDate: Sat Dec 9 15:43:46 2023 +0100

    (Some random cleanup of recent servlet related changes)
---
 ivy.xml                                                         | 7 ++++---
 src/main/java/freemarker/ext/servlet/FreemarkerServlet.java     | 8 ++++----
 src/test/java/freemarker/ext/jsp/RealServletContainertTest.java | 4 +++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index b379f16f..cc573d2b 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -22,6 +22,7 @@
 -->
 <!DOCTYPE ivy-module [
     <!ENTITY jetty.version "9.4.53.v20231009">
+    <!ENTITY standardTaglibs.version "1.2.5">
     <!ENTITY slf4j.version "1.6.1">
     <!ENTITY spring.version "2.5.6.SEC03">
 ]>
@@ -145,9 +146,9 @@
     <dependency org="org.eclipse.jetty" name="jetty-webapp" 
rev="&jetty.version;" conf="test->default" />
     <dependency org="org.eclipse.jetty" name="jetty-util" 
rev="&jetty.version;" conf="test->default" />
     <dependency org="org.eclipse.jetty" name="apache-jsp" 
rev="&jetty.version;" conf="test->default" />
-    <!-- JPS JSTL: -->
-    <dependency org="org.apache.taglibs" name="taglibs-standard-impl" 
rev="1.2.5" conf="test->default" />
-    <dependency org="org.apache.taglibs" name="taglibs-standard-spec" 
rev="1.2.5" conf="test->default" />
+    <!-- JSP JSTL (not included in Jetty): -->
+    <dependency org="org.apache.taglibs" name="taglibs-standard-impl" 
rev="&standardTaglibs.version;" conf="test->default" />
+    <dependency org="org.apache.taglibs" name="taglibs-standard-spec" 
rev="&standardTaglibs.version;" conf="test->default" />
 
     <dependency org="displaytag" name="displaytag" rev="1.2" 
conf="test->default">
       <exclude org="com.lowagie" name="itext" />
diff --git a/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java 
b/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
index e8a38997..88b22523 100644
--- a/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
+++ b/src/main/java/freemarker/ext/servlet/FreemarkerServlet.java
@@ -899,7 +899,7 @@ public class FreemarkerServlet extends HttpServlet {
             }
 
             if (suppressServletException) {
-                logSerlvetExceptionWithFreemarkerLog("Error executing 
FreeMarker template", e);
+                logServletExceptionWithFreemarkerLog("Error executing 
FreeMarker template", e);
                 log("Error executing FreeMarker template. " +
                         "Servlet-level exception was suppressed to show debug 
page with HTTP 200. " +
                         "See earlier FreeMarker log message for details!");
@@ -953,7 +953,7 @@ public class FreemarkerServlet extends HttpServlet {
     }
 
     private ServletException newServletExceptionWithFreeMarkerLogging(String 
message, Throwable cause) throws ServletException {
-        logSerlvetExceptionWithFreemarkerLog(message, cause);
+        logServletExceptionWithFreemarkerLog(message, cause);
 
         ServletException e = new ServletException(message, cause);
         try {
@@ -963,10 +963,10 @@ public class FreemarkerServlet extends HttpServlet {
         } catch (Exception ex) {
             // Ignored; see above
         }
-        throw e;
+        return e;
     }
 
-    private static void logSerlvetExceptionWithFreemarkerLog(String message, 
Throwable cause) {
+    private static void logServletExceptionWithFreemarkerLog(String message, 
Throwable cause) {
         if (cause instanceof TemplateException) {
             // For backward compatibility, we log into the same category as 
Environment did when
             // log_template_exceptions was true.
diff --git a/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java 
b/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java
index 8c3982e7..a89d7983 100644
--- a/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java
+++ b/src/test/java/freemarker/ext/jsp/RealServletContainertTest.java
@@ -213,7 +213,9 @@ public class RealServletContainertTest extends 
WebAppTestCase {
         assertEquals(404, getResponseStatusCode(WEBAPP_ERRORS, "missing.jsp"));
         assertEquals(500, getResponseStatusCode(WEBAPP_ERRORS, 
"failing-runtime.jsp"));
         assertEquals(500, getResponseStatusCode(WEBAPP_ERRORS, 
"failing-parsetime.jsp"));
-        
+
+        assertEquals(200, getResponseStatusCode(WEBAPP_ERRORS,
+                
"tester?view=not-failing.ftl&viewServlet=freemarker-default-dev"));
         assertEquals(404, getResponseStatusCode(WEBAPP_ERRORS,
                 "tester?view=missing.ftl&viewServlet=freemarker-default-dev"));
         assertEquals(200, getResponseStatusCode(WEBAPP_ERRORS,