[tomcat] branch 8.5.x updated: Fix lambda

[remm]

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

remm 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 4836e260f4 Fix lambda
4836e260f4 is described below

commit 4836e260f473d7d832b74a2cf1f1d1f7f0b9c8e2
Author: remm <r...@apache.org>
AuthorDate: Fri Mar 3 13:26:11 2023 +0100

    Fix lambda
---
 .../org/apache/catalina/valves/JsonAccessLogValve.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/valves/JsonAccessLogValve.java 
b/java/org/apache/catalina/valves/JsonAccessLogValve.java
index cd48cfceb2..aae85b824f 100644
--- a/java/org/apache/catalina/valves/JsonAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JsonAccessLogValve.java
@@ -97,7 +97,11 @@ public class JsonAccessLogValve extends AccessLogValve {
     protected AccessLogElement[] createLogElements() {
         List<AccessLogElement> logElements = new 
ArrayList<>(Arrays.asList(super.createLogElements()));
         ListIterator<AccessLogElement> lit = logElements.listIterator();
-        lit.add((buf, date, req, resp, time) -> buf.write('{'));
+        lit.add(new AccessLogElement() {
+            @Override
+            public void addElement(CharArrayWriter buf, Date date, Request 
request, Response response, long time) {
+                buf.write('{');
+            }});
         while (lit.hasNext()) {
             AccessLogElement logElement = lit.next();
             // remove all other elements, like StringElements
@@ -105,12 +109,20 @@ public class JsonAccessLogValve extends AccessLogValve {
                 lit.remove();
                 continue;
             }
-            lit.add((buf, date, req, resp, time) -> buf.write(','));
+            lit.add(new AccessLogElement() {
+                @Override
+                public void addElement(CharArrayWriter buf, Date date, Request 
request, Response response, long time) {
+                    buf.write(',');
+                }});
         }
         // remove last comma again
         lit.previous();
         lit.remove();
-        lit.add((buf, date, req, resp, time) -> buf.write('}'));
+        lit.add(new AccessLogElement() {
+            @Override
+            public void addElement(CharArrayWriter buf, Date date, Request 
request, Response response, long time) {
+                buf.write('}');
+            }});
         return logElements.toArray(new AccessLogElement[logElements.size()]);
     }
 


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