Author: markt
Date: Fri Jan 9 10:05:24 2015
New Revision: 1650477
URL: http://svn.apache.org/r1650477
Log:
Remove unnecessary code since o.a.coyote.http11.Constants is now pre-loaded.
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
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=1650477&r1=1650476&r2=1650477&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Fri
Jan 9 10:05:24 2015
@@ -163,7 +163,6 @@ public final class SecurityClassLoad {
private static final void loadCoyotePackage(ClassLoader loader)
throws Exception {
final String basePackage = "org.apache.coyote.";
- loader.loadClass(basePackage + "http11.Http11OutputBuffer$1");
loader.loadClass(basePackage + "http11.Constants");
// Make sure system property is read at this point
Class<?> clazz = loader.loadClass(basePackage + "Constants");
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1650477&r1=1650476&r2=1650477&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Fri Jan
9 10:05:24 2015
@@ -17,8 +17,6 @@
package org.apache.coyote.http11;
import java.io.IOException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import org.apache.coyote.ActionCode;
import org.apache.coyote.OutputBuffer;
@@ -414,23 +412,8 @@ public class Http11OutputBuffer implemen
write(message);
}
- // End the response status line
- // TODO o.a.coyoye.http11.Constants is pre-loaded. Can we drop this?
- if (org.apache.coyote.Constants.IS_SECURITY_ENABLED){
- AccessController.doPrivileged(
- new PrivilegedAction<Void>(){
- @Override
- public Void run(){
- headerBuffer[pos++] = Constants.CR;
- headerBuffer[pos++] = Constants.LF;
- return null;
- }
- }
- );
- } else {
- headerBuffer[pos++] = Constants.CR;
- headerBuffer[pos++] = Constants.LF;
- }
+ headerBuffer[pos++] = Constants.CR;
+ headerBuffer[pos++] = Constants.LF;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
