Author: markt
Date: Thu Aug 16 20:18:28 2012
New Revision: 1374035
URL: http://svn.apache.org/viewvc?rev=1374035&view=rev
Log:
Use the getter
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1374035&r1=1374034&r2=1374035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Aug 16
20:18:28 2012
@@ -360,7 +360,7 @@ public abstract class AbstractProtocol i
private ObjectName createObjectName() throws MalformedObjectNameException {
// Use the same domain as the connector
- domain = adapter.getDomain();
+ domain = getAdapter().getDomain();
if (domain == null) {
return null;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1374035&r1=1374034&r2=1374035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu Aug 16
20:18:28 2012
@@ -143,7 +143,7 @@ public class AjpAprProtocol extends Abst
@Override
protected AjpAprProcessor createProcessor() {
AjpAprProcessor processor = new AjpAprProcessor(proto.packetSize,
(AprEndpoint)proto.endpoint);
- processor.setAdapter(proto.adapter);
+ processor.setAdapter(proto.getAdapter());
processor.setTomcatAuthentication(proto.tomcatAuthentication);
processor.setRequiredSecret(proto.requiredSecret);
processor.setClientCertProvider(proto.getClientCertProvider());
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1374035&r1=1374034&r2=1374035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Thu Aug 16
20:18:28 2012
@@ -172,7 +172,7 @@ public class AjpNioProtocol extends Abst
@Override
protected AjpNioProcessor createProcessor() {
AjpNioProcessor processor = new AjpNioProcessor(proto.packetSize,
(NioEndpoint)proto.endpoint);
- processor.setAdapter(proto.adapter);
+ processor.setAdapter(proto.getAdapter());
processor.setTomcatAuthentication(proto.tomcatAuthentication);
processor.setRequiredSecret(proto.requiredSecret);
processor.setClientCertProvider(proto.getClientCertProvider());
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1374035&r1=1374034&r2=1374035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Thu Aug 16
20:18:28 2012
@@ -132,7 +132,7 @@ public class AjpProtocol extends Abstrac
@Override
protected AjpProcessor createProcessor() {
AjpProcessor processor = new AjpProcessor(proto.packetSize,
(JIoEndpoint)proto.endpoint);
- processor.setAdapter(proto.adapter);
+ processor.setAdapter(proto.getAdapter());
processor.setTomcatAuthentication(proto.tomcatAuthentication);
processor.setRequiredSecret(proto.requiredSecret);
processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1374035&r1=1374034&r2=1374035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu Aug
16 20:18:28 2012
@@ -203,7 +203,7 @@ public class Http11AprProtocol extends A
super.start();
if (npnHandler != null) {
long sslCtx = ((AprEndpoint) endpoint).getJniSslContext();
- npnHandler.init(endpoint, sslCtx, adapter);
+ npnHandler.init(endpoint, sslCtx, getAdapter());
}
}
@@ -309,7 +309,7 @@ public class Http11AprProtocol extends A
Http11AprProcessor processor = new Http11AprProcessor(
proto.getMaxHttpHeaderSize(), (AprEndpoint)proto.endpoint,
proto.getMaxTrailerSize());
- processor.setAdapter(proto.adapter);
+ processor.setAdapter(proto.getAdapter());
processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
processor.setConnectionUploadTimeout(
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1374035&r1=1374034&r2=1374035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu Aug
16 20:18:28 2012
@@ -80,7 +80,7 @@ public class Http11NioProtocol extends A
public void start() throws Exception {
super.start();
if (npnHandler != null) {
- npnHandler.init(getEndpoint(), 0, adapter);
+ npnHandler.init(getEndpoint(), 0, getAdapter());
}
}
@@ -283,7 +283,7 @@ public class Http11NioProtocol extends A
Http11NioProcessor processor = new Http11NioProcessor(
proto.getMaxHttpHeaderSize(), (NioEndpoint)proto.endpoint,
proto.getMaxTrailerSize());
- processor.setAdapter(proto.adapter);
+ processor.setAdapter(proto.getAdapter());
processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
processor.setConnectionUploadTimeout(
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1374035&r1=1374034&r2=1374035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Thu Aug 16
20:18:28 2012
@@ -95,7 +95,7 @@ public class Http11Protocol extends Abst
public void start() throws Exception {
super.start();
if (npnHandler != null) {
- npnHandler.init(endpoint, 0, adapter);
+ npnHandler.init(endpoint, 0, getAdapter());
}
}
@@ -186,7 +186,7 @@ public class Http11Protocol extends Abst
Http11Processor processor = new Http11Processor(
proto.getMaxHttpHeaderSize(), (JIoEndpoint)proto.endpoint,
proto.getMaxTrailerSize());
- processor.setAdapter(proto.adapter);
+ processor.setAdapter(proto.getAdapter());
processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
processor.setConnectionUploadTimeout(
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java?rev=1374035&r1=1374034&r2=1374035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java Thu Aug 16
20:18:28 2012
@@ -92,7 +92,7 @@ public class SpdyProxyProtocol extends A
@Override
public void onStream(SpdyConnection con, SpdyStream ch) throws
IOException {
SpdyProcessor sp = new SpdyProcessor(con, endpoint);
- sp.setAdapter(adapter);
+ sp.setAdapter(getAdapter());
sp.onSynStream(ch);
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
