Author: markt
Date: Thu Mar 15 10:33:31 2012
New Revision: 1300888
URL: http://svn.apache.org/viewvc?rev=1300888&view=rev
Log:
Port some clean-up
Simplify merge info
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FilterBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 10:33:31 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320
,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226
551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1
244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263
,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226
538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1
244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
Thu Mar 15 10:33:31 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.filters;
import java.io.IOException;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/Constants.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/Constants.java Thu
Mar 15 10:33:31 2012
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.filters;
@@ -26,7 +24,6 @@ package org.apache.catalina.filters;
* @author Craig R. McClanahan
* @version $Id$
*/
-
public final class Constants {
public static final String Package = "org.apache.catalina.filters";
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
Thu Mar 15 10:33:31 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.filters;
import java.io.IOException;
@@ -211,14 +210,16 @@ public class CsrfPreventionFilter extend
for (int j = 0; j < random.length; j++) {
byte b1 = (byte) ((random[j] & 0xf0) >> 4);
byte b2 = (byte) (random[j] & 0x0f);
- if (b1 < 10)
+ if (b1 < 10) {
buffer.append((char) ('0' + b1));
- else
+ } else {
buffer.append((char) ('A' + (b1 - 10)));
- if (b2 < 10)
+ }
+ if (b2 < 10) {
buffer.append((char) ('0' + b2));
- else
+ } else {
buffer.append((char) ('A' + (b2 - 10)));
+ }
}
return buffer.toString();
@@ -227,7 +228,7 @@ public class CsrfPreventionFilter extend
protected static class CsrfResponseWrapper
extends HttpServletResponseWrapper {
- private String nonce;
+ private final String nonce;
public CsrfResponseWrapper(HttpServletResponse response, String nonce)
{
super(response);
@@ -264,8 +265,9 @@ public class CsrfPreventionFilter extend
*/
private String addNonce(String url) {
- if ((url == null) || (nonce == null))
+ if ((url == null) || (nonce == null)) {
return (url);
+ }
String path = url;
String query = "";
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
Thu Mar 15 10:33:31 2012
@@ -464,12 +464,12 @@ public class ExpiresFilter extends Filte
/**
* List of duration elements.
*/
- private List<Duration> durations;
+ private final List<Duration> durations;
/**
* Starting point of the elaspse to set in the response.
*/
- private StartingPoint startingPoint;
+ private final StartingPoint startingPoint;
public ExpiresConfiguration(StartingPoint startingPoint,
List<Duration> durations) {
@@ -533,7 +533,7 @@ public class ExpiresFilter extends Filte
private PrintWriter printWriter;
- private HttpServletRequest request;
+ private final HttpServletRequest request;
private ServletOutputStream servletOutputStream;
@@ -636,11 +636,11 @@ public class ExpiresFilter extends Filte
* "Start Write Response Body" event.
*/
public class XPrintWriter extends PrintWriter {
- private PrintWriter out;
+ private final PrintWriter out;
- private HttpServletRequest request;
+ private final HttpServletRequest request;
- private XHttpServletResponse response;
+ private final XHttpServletResponse response;
public XPrintWriter(PrintWriter out, HttpServletRequest request,
XHttpServletResponse response) {
@@ -851,11 +851,11 @@ public class ExpiresFilter extends Filte
*/
public class XServletOutputStream extends ServletOutputStream {
- private HttpServletRequest request;
+ private final HttpServletRequest request;
- private XHttpServletResponse response;
+ private final XHttpServletResponse response;
- private ServletOutputStream servletOutputStream;
+ private final ServletOutputStream servletOutputStream;
public XServletOutputStream(ServletOutputStream servletOutputStream,
HttpServletRequest request, XHttpServletResponse response) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FilterBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FilterBase.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FilterBase.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FilterBase.java Thu
Mar 15 10:33:31 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.filters;
import java.util.Enumeration;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
Thu Mar 15 10:33:31 2012
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.filters;
@@ -40,8 +38,7 @@ import org.apache.juli.logging.LogFactor
*
*/
-public final class RemoteAddrFilter
- extends RequestFilter {
+public final class RemoteAddrFilter extends RequestFilter {
// ----------------------------------------------------- Instance Variables
private static final Log log = LogFactory.getLog(RemoteAddrFilter.class);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
Thu Mar 15 10:33:31 2012
@@ -5,17 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.filters;
@@ -37,24 +35,16 @@ import org.apache.juli.logging.LogFactor
* based on the remote client's host name.
*
* @author Craig R. McClanahan
- *
+ *
*/
+public final class RemoteHostFilter extends RequestFilter {
-public final class RemoteHostFilter
- extends RequestFilter {
-
- // ----------------------------------------------------- Instance Variables
private static final Log log = LogFactory.getLog(RemoteHostFilter.class);
- // ------------------------------------------------------------- Properties
-
-
-
// --------------------------------------------------------- Public Methods
-
/**
* Extract the desired request property, and pass it (along with the
* specified request and response objects and associated filter chain) to
@@ -71,11 +61,11 @@ public final class RemoteHostFilter
@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
-
+
process(request.getRemoteHost(), request, response, chain);
}
-
+
/**
* Extract the desired request property, and pass it (along with the comet
* event and filter chain) to the protected <code>process()</code> method
@@ -91,12 +81,11 @@ public final class RemoteHostFilter
public void doFilterEvent(CometEvent event, CometFilterChain chain)
throws IOException, ServletException {
processCometEvent(event.getHttpServletRequest().getRemoteHost(),
- event, chain);
+ event, chain);
}
@Override
protected Log getLogger() {
return log;
}
-
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
Thu Mar 15 10:33:31 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.filters;
import java.io.IOException;
@@ -49,7 +48,6 @@ import org.apache.juli.logging.LogFactor
*
* @author Craig R. McClanahan
*/
-
public class RequestDumperFilter implements Filter {
private static final String NON_HTTP_REQ_MSG =
@@ -121,9 +119,10 @@ public class RequestDumperFilter impleme
doLog(" contextPath", hRequest.getContextPath());
Cookie cookies[] = hRequest.getCookies();
if (cookies != null) {
- for (int i = 0; i < cookies.length; i++)
+ for (int i = 0; i < cookies.length; i++) {
doLog(" cookie", cookies[i].getName() +
"=" + cookies[i].getValue());
+ }
}
Enumeration<String> hnames = hRequest.getHeaderNames();
while (hnames.hasMoreElements()) {
@@ -151,8 +150,9 @@ public class RequestDumperFilter impleme
StringBuilder result = new StringBuilder(pname);
result.append('=');
for (int i = 0; i < pvalues.length; i++) {
- if (i > 0)
+ if (i > 0) {
result.append(", ");
+ }
result.append(pvalues[i]);
}
doLog(" parameter", result.toString());
@@ -219,8 +219,9 @@ public class RequestDumperFilter impleme
Iterable<String> rhnames = hResponse.getHeaderNames();
for (String rhname : rhnames) {
Iterable<String> rhvalues = hResponse.getHeaders(rhname);
- for (String rhvalue : rhvalues)
+ for (String rhvalue : rhvalues) {
doLog(" header", rhname + "=" + rhvalue);
+ }
}
}
@@ -274,8 +275,8 @@ public class RequestDumperFilter impleme
}
private static final class Timestamp {
- private Date date = new Date(0);
- private SimpleDateFormat format =
+ private final Date date = new Date(0);
+ private final SimpleDateFormat format =
new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
private String dateString = format.format(date);
private void update() {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestFilter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestFilter.java
Thu Mar 15 10:33:31 2012
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.filters;
@@ -57,9 +55,7 @@ import org.apache.catalina.comet.CometFi
* <li>The request will be rejected with a "Forbidden" HTTP response.</li>
* </ul>
*/
-
-public abstract class RequestFilter
- extends FilterBase implements CometFilter {
+public abstract class RequestFilter extends FilterBase implements CometFilter {
// ----------------------------------------------------- Instance Variables
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
Thu Mar 15 10:33:31 2012
@@ -52,7 +52,6 @@ import org.apache.juli.logging.LogFactor
* and <code>User-Agent</code> headers, or a value stashed in the current
* user's session.</p>
*/
-
public class SetCharacterEncodingFilter extends FilterBase {
private static final Log log =
@@ -100,8 +99,9 @@ public class SetCharacterEncodingFilter
// Conditionally select and set the character encoding to be used
if (ignore || (request.getCharacterEncoding() == null)) {
String characterEncoding = selectEncoding(request);
- if (characterEncoding != null)
+ if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
+ }
}
// Pass control on to the next filter
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java?rev=1300888&r1=1300887&r2=1300888&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
Thu Mar 15 10:33:31 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.filters;
import java.io.IOException;
@@ -58,7 +57,6 @@ import javax.servlet.http.HttpServletRes
* <li>Unknown issue means it doesn't work</li>
* </ul>
*/
-
public class WebdavFixFilter implements Filter {
private static final String LOG_MESSAGE_PREAMBLE =
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
