More refactoring to reduce duplication

Author: markt-asf

java/org/apache/catalina/valves/AbstractAccessLogValve.java

@@ -1331,7 +1331,7 @@ public void addElement(CharArrayWriter buf, Date date, Request request, Response
                     buf.append(request.getMethod());
                     buf.append(' ');
                     escapeAndAppend(request.getRequestURI(), buf);
-                    appendQueryString(request.getQueryString(), buf, false);
+                    appendQueryString(request.getQueryString(), buf, true, false, false);
                     buf.append(' ');
                     buf.append(request.getProtocol());
                 }
@@ -1575,16 +1575,19 @@ public void addElement(CharArrayWriter buf, Date date, Request request, Response
             if (request != null) {
                 query = request.getQueryString();
             }
-            appendQueryString(query, buf, true);
+            appendQueryString(query, buf, true, false, true);
         }
     }
 
-    protected static void appendQueryString(String query, CharArrayWriter buf, boolean writeDashOnNull) {
+    protected static void appendQueryString(String query, CharArrayWriter buf,
+            boolean appendDelim, boolean escapeQuoteAsDouble, boolean writeDashOnNull) {
         if (query != null) {
-            buf.append('?');
+            if (appendDelim) {
+                buf.append('?');
+            }
             // Don't want to write "-" if the query string is empty
             if (!query.isEmpty()) {
-                escapeAndAppend(query, buf);
+                escapeAndAppend(query, buf, escapeQuoteAsDouble);
             }
         } else if (writeDashOnNull) {
             buf.append('-');

java/org/apache/catalina/valves/ExtendedAccessLogValve.java

@@ -576,14 +576,7 @@ public void addElement(CharArrayWriter buf, Date date, Request request, Response
                                 if (request != null) {
                                     query = request.getQueryString();
                                 }
-                                if (query == null) {
-                                    buf.append('-');
-                                } else if (query.isEmpty()) {
-                                    // NO-OP
-                                    // Don't want to write "-" if the query string is present but empty
-                                } else {
-                                    escapeAndAppend(query, buf, true);
-                                }
+                                appendQueryString(query, buf, false, true, true);
                             }
                         };
                     }
@@ -594,14 +587,7 @@ public void addElement(CharArrayWriter buf, Date date, Request request, Response
                                 long time) {
                             if (request != null) {
                                 escapeAndAppend(request.getRequestURI(), buf);
-                                String query = request.getQueryString();
-                                if (query != null) {
-                                    buf.append('?');
-                                    // Don't want to write "-" if the query string is present but empty
-                                    if (!query.isEmpty()) {
-                                        buf.append(query);
-                                    }
-                                }
+                                appendQueryString(request.getQueryString(), buf, true, true, false);
                             } else {
                                 buf.append('-');
                             }