Author: costin
Date: Sun Sep 7 08:36:46 2008
New Revision: 692880
URL: http://svn.apache.org/viewvc?rev=692880&view=rev
Log:
Merging from sandbox: the casts are redundant for now, but in a future commit
RequestInfo won't directly depend on JMX
( this is the only dep between base coyote/tomcat-lite and JMX ). Tomcat-lite
still uses JMX, but optionally.
Also exposing the endpoint, for easier programmatic config.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.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
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=692880&r1=692879&r2=692880&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Sep 7
08:36:46 2008
@@ -447,7 +447,7 @@
try {
RequestInfo rp =
processor.getRequest().getRequestProcessor();
rp.setGlobalProcessor(null);
- ObjectName rpName = rp.getRpName();
+ ObjectName rpName = (ObjectName) rp.getRpName();
if (log.isDebugEnabled()) {
log.debug("Unregister " + rpName);
}
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=692880&r1=692879&r2=692880&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Sun Sep 7
08:36:46 2008
@@ -433,7 +433,7 @@
try {
RequestInfo rp =
processor.getRequest().getRequestProcessor();
rp.setGlobalProcessor(null);
- ObjectName rpName = rp.getRpName();
+ ObjectName rpName = (ObjectName) rp.getRpName();
if (log.isDebugEnabled()) {
log.debug("Unregister " + rpName);
}
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=692880&r1=692879&r2=692880&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Sun Sep
7 08:36:46 2008
@@ -652,7 +652,7 @@
try {
RequestInfo rp =
processor.getRequest().getRequestProcessor();
rp.setGlobalProcessor(null);
- ObjectName rpName = rp.getRpName();
+ ObjectName rpName = (ObjectName) rp.getRpName();
if (log.isDebugEnabled()) {
log.debug("Unregister " + rpName);
}
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=692880&r1=692879&r2=692880&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sun Sep
7 08:36:46 2008
@@ -81,6 +81,10 @@
attributes.put(name, value);
}
+ public NioEndpoint getEndpoint() {
+ return ep;
+ }
+
public Object getAttribute( String key ) {
if( log.isTraceEnabled())
log.trace(sm.getString("http11protocol.getattribute", key));
@@ -809,7 +813,7 @@
if (log.isDebugEnabled()) log.debug("Deregister
["+processor+"] count="+registerCount.get());
RequestInfo rp =
processor.getRequest().getRequestProcessor();
rp.setGlobalProcessor(null);
- ObjectName rpName = rp.getRpName();
+ ObjectName rpName = (ObjectName) rp.getRpName();
Registry.getRegistry(null,
null).unregisterComponent(rpName);
rp.setRpName(null);
} catch (Exception e) {
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=692880&r1=692879&r2=692880&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Sun Sep 7
08:36:46 2008
@@ -663,7 +663,7 @@
try {
RequestInfo rp =
processor.getRequest().getRequestProcessor();
rp.setGlobalProcessor(null);
- ObjectName rpName = rp.getRpName();
+ ObjectName rpName = (ObjectName) rp.getRpName();
if (log.isDebugEnabled()) {
log.debug("Unregister " + rpName);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
