Author: markt
Date: Wed Apr 5 15:25:29 2017
New Revision: 1790292
URL: http://svn.apache.org/viewvc?rev=1790292&view=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=47214
Replace explicitly referenced anonymous inner classes in InputBuffer with named
inner classes.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1790292&r1=1790291&r2=1790292&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Wed Apr 5
15:25:29 2017
@@ -582,13 +582,7 @@ public class InputBuffer extends Reader
private static B2CConverter createConverter(Charset charset) throws
IOException {
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
- return AccessController.doPrivileged(new
PrivilegedExceptionAction<B2CConverter>() {
-
- @Override
- public B2CConverter run() throws IOException {
- return new B2CConverter(charset);
- }
- });
+ return AccessController.doPrivileged(new
PrivilegedCreateConverter(charset));
} catch (PrivilegedActionException ex) {
Exception e = ex.getException();
if (e instanceof IOException) {
@@ -674,4 +668,20 @@ public class InputBuffer extends Reader
cb = tmp;
tmp = null;
}
+
+
+ private static class PrivilegedCreateConverter
+ implements PrivilegedExceptionAction<B2CConverter> {
+
+ private final Charset charset;
+
+ public PrivilegedCreateConverter(Charset charset) {
+ this.charset = charset;
+ }
+
+ @Override
+ public B2CConverter run() throws IOException {
+ return new B2CConverter(charset);
+ }
+ }
}
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1790292&r1=1790291&r2=1790292&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Wed
Apr 5 15:25:29 2017
@@ -254,7 +254,7 @@ public final class SecurityClassLoad {
"CoyoteInputStream$PrivilegedReadBuffer");
loader.loadClass
(basePackage +
- "InputBuffer$1");
+ "InputBuffer$PrivilegedCreateConverter");
loader.loadClass
(basePackage +
"Response$1");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
