Author: jim
Date: Wed Mar  5 08:18:09 2008
New Revision: 633907

URL: http://svn.apache.org/viewvc?rev=633907&view=rev
Log:
Merge r620778 from trunk:

ExtendedAccessLogValve cs-uri not print empty querystring
Submitted by: pero
Reviewed by: jim

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=633907&r1=633906&r2=633907&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  5 08:18:09 2008
@@ -37,10 +37,6 @@
                     that needs to be removed will now be marked as deprecated
                     in 6.0.x (see patch below).
 
-* ExtendedAccessLogValve cs-uri not print empty querystring
-  http://svn.apache.org/viewvc?rev=620778&view=rev
-  +1: pero,funkman,markt
-
 * lib is relative to catalina home, not base
   http://svn.apache.org/viewvc?rev=627602&view=rev
   +1: markt, fhanik, jim

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=633907&r1=633906&r2=633907&view=diff
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
 Wed Mar  5 08:18:09 2008
@@ -663,7 +663,7 @@
                         public void addElement(StringBuffer buf, Date date,
                                 Request request, Response response, long time) 
{
                             String query = request.getQueryString();
-                            if (query != null) {
+                            if (query == null) {
                                 buf.append(request.getRequestURI());
                             } else {
                                 buf.append(request.getRequestURI());

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=633907&r1=633906&r2=633907&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Mar  5 08:18:09 2008
@@ -34,6 +34,12 @@
 <body>
 <section name="Tomcat 6.0.17 (remm)">
   <subsection name="Catalina">
+     <changelog>
+      <fix>ExtendedAccessLogValve cs-uri not print empty querystring (pero)
+      </fix>
+     </changelog>
+  </subsection>
+  <subsection name="Catalina">
     <changelog>
       <update>
         ServletContext.getResource("noslash/resource") only requires forward 
slash if STRICT_SERVLET_COMPLIANCE



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to