Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added some state to avoid npe when starting the connectorServer after stop has been called 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384738 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2006-03-10 09:11:56 +00:00
parent f2e210bef3
commit c5f96e1db5
1 changed files with 151 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
View File

@ -2,17 +2,14 @@
*
* Copyright 2005-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.apache.activemq.broker.jmx;
@ -20,7 +17,6 @@ import java.io.IOException;
import java.net.MalformedURLException;
import java.rmi.registry.LocateRegistry;
import java.util.List;
import javax.management.Attribute;
import javax.management.JMException;
import javax.management.MBeanServer;
@ -30,11 +26,10 @@ import javax.management.ObjectName;
import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
import org.apache.activemq.Service;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
/**
* A Flow provides different dispatch policies within the NMR
*
@ -47,21 +42,17 @@ public class ManagementContext implements Service {
* Default activemq domain
*/
public static final String DEFAULT_DOMAIN="org.apache.activemq";
private final static Log log=LogFactory.getLog(ManagementContext.class);
private MBeanServer beanServer;
private String jmxDomainName=DEFAULT_DOMAIN;
private boolean useMBeanServer=true;
private boolean createMBeanServer=true;
private boolean locallyCreateMBeanServer=false;
private boolean createConnector=true;
private int connectorPort=1099;
private String connectorPath="/jmxrmi";
private AtomicBoolean started=new AtomicBoolean(false);
private JMXConnectorServer connectorServer;
private ObjectName namingServiceObjectName;
public ManagementContext(){
@ -74,17 +65,19 @@ public class ManagementContext implements Service {
public void start() throws IOException{
// lets force the MBeanServer to be created if needed
if(started.compareAndSet(false,true)){
getMBeanServer();
if(connectorServer!=null){
try{
getMBeanServer().invoke(namingServiceObjectName,"start",null,null);
} catch (Throwable ignore) {
}
}catch(Throwable ignore){}
Thread t=new Thread("JMX connector"){
public void run(){
try{
if(started.get()&&connectorServer!=null){
connectorServer.start();
log.info("JMX consoles can connect to "+connectorServer.getAddress());
}
}catch(IOException e){
log.warn("Failed to start jmx connector: "+e.getMessage());
}
@ -94,9 +87,10 @@ public class ManagementContext implements Service {
t.start();
}
}
}
public void stop() throws IOException{
if(started.compareAndSet(true,false)){
if(connectorServer!=null){
try{
connectorServer.stop();
@ -106,10 +100,8 @@ public class ManagementContext implements Service {
connectorServer=null;
try{
getMBeanServer().invoke(namingServiceObjectName,"stop",null,null);
} catch (Throwable ignore) {
}catch(Throwable ignore){}
}
}
if(locallyCreateMBeanServer&&beanServer!=null){
// check to see if the factory knows about this server
List list=MBeanServerFactory.findMBeanServer(null);
@ -118,6 +110,7 @@ public class ManagementContext implements Service {
}
}
}
}
/**
* @return Returns the jmxDomainName.
@ -148,6 +141,7 @@ public class ManagementContext implements Service {
/**
* Set the MBeanServer
*
* @param beanServer
*/
public void setMBeanServer(MBeanServer beanServer){
@ -189,16 +183,14 @@ public class ManagementContext implements Service {
*
* @param type
* @param name
* @return the JMX ObjectName of the MBean, or <code>null</code> if
* <code>customName</code> is invalid.
* @return the JMX ObjectName of the MBean, or <code>null</code> if <code>customName</code> is invalid.
*/
public ObjectName createCustomComponentMBeanName(String type,String name){
ObjectName result=null;
String tmp=jmxDomainName+":"+"type="+sanitizeString(type)+",name="+sanitizeString(name);
try{
result=new ObjectName(tmp);
}
catch (MalformedObjectNameException e) {
}catch(MalformedObjectNameException e){
log.error("Couldn't create ObjectName from: "+type+" , "+name);
}
return result;
@ -231,8 +223,7 @@ public class ManagementContext implements Service {
*/
public static ObjectName getSystemObjectName(String domainName,String containerName,Class theClass)
throws MalformedObjectNameException,NullPointerException{
String tmp = domainName + ":" + "type=" + theClass.getName() + ",name="
+ getRelativeName(containerName, theClass);
String tmp=domainName+":"+"type="+theClass.getName()+",name="+getRelativeName(containerName,theClass);
return new ObjectName(tmp);
}
@ -269,15 +260,12 @@ public class ManagementContext implements Service {
result=(MBeanServer) list.get(0);
}
}
if(result==null&&createMBeanServer){
result=createMBeanServer();
}
}
catch (NoClassDefFoundError e) {
}catch(NoClassDefFoundError e){
log.error("Couldnot load MBeanServer",e);
}
catch (Throwable e) {
}catch(Throwable e){
// probably don't have access to system properties
log.error("Failed to initialize MBeanServer",e);
}
@ -293,12 +281,9 @@ public class ManagementContext implements Service {
protected MBeanServer createMBeanServer() throws MalformedObjectNameException,IOException{
MBeanServer mbeanServer=MBeanServerFactory.createMBeanServer(jmxDomainName);
locallyCreateMBeanServer=true;
if(createConnector){
createConnector(mbeanServer);
}
return mbeanServer;
}
@ -308,38 +293,34 @@ public class ManagementContext implements Service {
* @throws MalformedURLException
* @throws IOException
*/
private void createConnector(MBeanServer mbeanServer) throws MalformedObjectNameException, MalformedURLException, IOException {
private void createConnector(MBeanServer mbeanServer) throws MalformedObjectNameException,MalformedURLException,
IOException{
// Create the NamingService, needed by JSR 160
try{
LocateRegistry.createRegistry(connectorPort);
namingServiceObjectName=ObjectName.getInstance("naming:type=rmiregistry");
// Do not use the createMBean as the mx4j jar may not be in the
// same class loader than the server
Class cl=Class.forName("mx4j.tools.naming.NamingService");
mbeanServer.registerMBean(cl.newInstance(),namingServiceObjectName);
// mbeanServer.createMBean("mx4j.tools.naming.NamingService", namingServiceObjectName, null);
// set the naming port
Attribute attr=new Attribute("Port",new Integer(connectorPort));
mbeanServer.setAttribute(namingServiceObjectName,attr);
}catch(Throwable e){
log.debug("Failed to create local registry",e);
}
// Create the JMXConnectorServer
String serviceURL="service:jmx:rmi:///jndi/rmi://localhost:"+connectorPort+connectorPath;
JMXServiceURL url=new JMXServiceURL(serviceURL);
connectorServer=JMXConnectorServerFactory.newJMXConnectorServer(url,null,mbeanServer);
// log.info("JMX consoles can connect to serviceURL: " + serviceURL);
}
public String getConnectorPath(){
return connectorPath;
}
public void setConnectorPath(String connectorPath){
this.connectorPath=connectorPath;
}
@ -347,6 +328,7 @@ public class ManagementContext implements Service {
public int getConnectorPort(){
return connectorPort;
}
public void setConnectorPort(int connectorPort){
this.connectorPort=connectorPort;
}
@ -354,6 +336,7 @@ public class ManagementContext implements Service {
public boolean isCreateConnector(){
return createConnector;
}
public void setCreateConnector(boolean createConnector){
this.createConnector=createConnector;
}