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

Added explicit error for badly formated broker name 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561815 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2007-08-01 14:49:48 +00:00
parent ec6a7029c5
commit 64b8fb64f4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -549,13 +549,18 @@ public class BrokerService implements Service {
/** /**
* Sets the name of this broker; which must be unique in the network * Sets the name of this broker; which must be unique in the network
* @param brokerName
*/ */
public void setBrokerName(String brokerName) { public void setBrokerName(String brokerName) {
if (brokerName == null) { if (brokerName == null) {
throw new NullPointerException("The broker name cannot be null"); throw new NullPointerException("The broker name cannot be null");
} }
brokerName = brokerName.trim(); String str = brokerName.replaceAll("[^a-zA-Z0-9\\.\\_\\-\\:]", "_");
this.brokerName = brokerName; if (!str.equals(brokerName)) {
log.error("Broker Name: " + brokerName + " contained illegal characters - replaced with " + str);
}
this.brokerName = str.trim();
} }
public PersistenceAdapterFactory getPersistenceFactory() { public PersistenceAdapterFactory getPersistenceFactory() {
@ -573,7 +578,7 @@ public class BrokerService implements Service {
} }
public File getBrokerDataDirectory() { public File getBrokerDataDirectory() {
String brokerDir = getBrokerName().replaceAll("[^a-zA-Z0-9\\.\\_\\-]", "_"); String brokerDir = getBrokerName();
return new File(getDataDirectoryFile(), brokerDir); return new File(getDataDirectoryFile(), brokerDir);
} }