← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat6/vivid-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/coyote/ajp/AjpAprProtocol.java

  • Committer: Package Import Robot
  • Author(s): tony mancill
  • Date: 2013-08-03 21:50:20 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20130803215020-glb1brkoau0zxr5x
Tags: 6.0.37-1
* New upstream release.
  - Drop patches for CVE-2012-4534, CVE-2012-4431, CVE-2012-3546,
    CVE-2012-2733, CVE-2012-3439
  - Drop 0011-CVE-02012-0022-regression-fix.patch
  - Drop 0017-eclipse-compiler-update.patch
* Freshened remaining patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/coyote/ajp/AjpAprProtocol.java
30
30
import javax.management.MBeanServer;
31
31
import javax.management.ObjectName;
32
32
 
 
33
import org.apache.coyote.AbstractProtocol;
33
34
import org.apache.coyote.ActionCode;
34
35
import org.apache.coyote.ActionHook;
35
36
import org.apache.coyote.Adapter;
36
 
import org.apache.coyote.ProtocolHandler;
37
37
import org.apache.coyote.RequestGroupInfo;
38
38
import org.apache.coyote.RequestInfo;
39
39
import org.apache.tomcat.util.modeler.Registry;
 
40
import org.apache.tomcat.util.net.AbstractEndpoint;
40
41
import org.apache.tomcat.util.net.AprEndpoint;
41
42
import org.apache.tomcat.util.net.SocketStatus;
42
43
import org.apache.tomcat.util.net.AprEndpoint.Handler;
51
52
 * @author Remy Maucherat
52
53
 * @author Costin Manolache
53
54
 */
54
 
public class AjpAprProtocol 
55
 
    implements ProtocolHandler, MBeanRegistration {
 
55
public class AjpAprProtocol extends AbstractProtocol
 
56
    implements MBeanRegistration {
56
57
    
57
58
    
58
59
    protected static org.apache.juli.logging.Log log =
91
92
     */
92
93
    protected AprEndpoint endpoint = new AprEndpoint();
93
94
 
 
95
    protected final AbstractEndpoint getEndpoint() {
 
96
        return endpoint;
 
97
    }
94
98
 
95
99
    /**
96
100
     * Configuration attributes.