From eb1a1943d361faffaac33348bee8b70be9d42e02 Mon Sep 17 00:00:00 2001 From: costin Date: Sun, 7 Sep 2008 15:36:46 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@692880 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AjpAprProtocol.java | 2 +- java/org/apache/coyote/ajp/AjpProtocol.java | 2 +- java/org/apache/coyote/http11/Http11AprProtocol.java | 2 +- java/org/apache/coyote/http11/Http11NioProtocol.java | 6 +++++- java/org/apache/coyote/http11/Http11Protocol.java | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java index e31bbfde5..a51bb1520 100644 --- a/java/org/apache/coyote/ajp/AjpAprProtocol.java +++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java @@ -447,7 +447,7 @@ public class AjpAprProtocol 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); } diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java index d54885f89..1ff288170 100644 --- a/java/org/apache/coyote/ajp/AjpProtocol.java +++ b/java/org/apache/coyote/ajp/AjpProtocol.java @@ -433,7 +433,7 @@ public class AjpProtocol 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); } diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index 09ae4c6cf..c19c38c4f 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -652,7 +652,7 @@ public class Http11AprProtocol implements ProtocolHandler, MBeanRegistration { 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); } diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java index dc6d83559..310346016 100644 --- a/java/org/apache/coyote/http11/Http11NioProtocol.java +++ b/java/org/apache/coyote/http11/Http11NioProtocol.java @@ -81,6 +81,10 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration 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 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration 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) { diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java index ff50b50b6..cd4cba5d3 100644 --- a/java/org/apache/coyote/http11/Http11Protocol.java +++ b/java/org/apache/coyote/http11/Http11Protocol.java @@ -663,7 +663,7 @@ public class Http11Protocol 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); } -- 2.11.0