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

This closes #453

This commit is contained in:
Clebert Suconic 2016-04-11 16:54:30 -04:00
parent 038efc60d2 3dc3e8520d
commit bb739be92d
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
View File

@ -115,7 +115,7 @@ public final class ObjectNameBuilder {
* @see DivertControl * @see DivertControl
*/ */
public ObjectName getDivertObjectName(final String name) throws Exception { public ObjectName getDivertObjectName(final String name) throws Exception {
return createObjectName(ObjectNameBuilder.CORE_MODULE, "Divert", name.toString()); return createObjectName(ObjectNameBuilder.CORE_MODULE, "Divert", name);
} }
/** /**

4
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
View File

@ -267,7 +267,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
String subName = null; String subName = null;
if (queue.isDurable()) { if (queue.isDurable()) {
Pair<String, String> pair = ActiveMQDestination.decomposeQueueNameForDurableSubscription(queue.getName().toString()); Pair<String, String> pair = ActiveMQDestination.decomposeQueueNameForDurableSubscription(queue.getName());
clientID = pair.getA(); clientID = pair.getA();
subName = pair.getB(); subName = pair.getB();
} }
@ -296,7 +296,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
String subName = null; String subName = null;
if (queue.isDurable() && !queue.getName().startsWith(ResourceNames.JMS_TOPIC)) { if (queue.isDurable() && !queue.getName().startsWith(ResourceNames.JMS_TOPIC)) {
Pair<String, String> pair = ActiveMQDestination.decomposeQueueNameForDurableSubscription(queue.getName().toString()); Pair<String, String> pair = ActiveMQDestination.decomposeQueueNameForDurableSubscription(queue.getName());
clientID = pair.getA(); clientID = pair.getA();
subName = pair.getB(); subName = pair.getB();
} }

2
artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTPublishManager.java
View File

@ -214,7 +214,7 @@ public class MQTTPublishManager {
} }
private void sendServerMessage(int messageId, ServerMessageImpl message, int deliveryCount, int qos) { private void sendServerMessage(int messageId, ServerMessageImpl message, int deliveryCount, int qos) {
String address = MQTTUtil.convertCoreAddressFilterToMQTT(message.getAddress().toString()).toString(); String address = MQTTUtil.convertCoreAddressFilterToMQTT(message.getAddress().toString());
ByteBuf payload = message.getBodyBufferDuplicate().byteBuf(); ByteBuf payload = message.getBodyBufferDuplicate().byteBuf();

4
artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTUtil.java
View File

@ -71,10 +71,10 @@ public class MQTTUtil {
} }
public static String convertCoreAddressFilterToMQTT(String filter) { public static String convertCoreAddressFilterToMQTT(String filter) {
if (filter.startsWith(MQTT_RETAIN_ADDRESS_PREFIX.toString())) { if (filter.startsWith(MQTT_RETAIN_ADDRESS_PREFIX)) {
filter = filter.substring(MQTT_RETAIN_ADDRESS_PREFIX.length(), filter.length()); filter = filter.substring(MQTT_RETAIN_ADDRESS_PREFIX.length(), filter.length());
} }
else if (filter.startsWith(MQTT_ADDRESS_PREFIX.toString())) { else if (filter.startsWith(MQTT_ADDRESS_PREFIX)) {
filter = filter.substring(MQTT_ADDRESS_PREFIX.length(), filter.length()); filter = filter.substring(MQTT_ADDRESS_PREFIX.length(), filter.length());
} }
return swapMQTTAndCoreWildCards(filter); return swapMQTTAndCoreWildCards(filter);

2
artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java
View File

@ -66,7 +66,7 @@ public class ProtonServerReceiverContext extends AbstractProtonReceiverContext {
catch (Exception e) { catch (Exception e) {
throw new ActiveMQAMQPInternalErrorException(e.getMessage(), e); throw new ActiveMQAMQPInternalErrorException(e.getMessage(), e);
} }
target.setAddress(queue.toString()); target.setAddress(queue);
} }
else { else {
//if not dynamic then we use the targets address as the address to forward the messages to, however there has to //if not dynamic then we use the targets address as the address to forward the messages to, however there has to

2
artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
View File

@ -314,7 +314,7 @@ public class StompDecoder {
headers.put(headerName, headerValue); headers.put(headerName, headerValue);
if (headerName.equals(Stomp.Headers.CONTENT_LENGTH)) { if (headerName.equals(Stomp.Headers.CONTENT_LENGTH)) {
contentLength = Integer.parseInt(headerValue.toString()); contentLength = Integer.parseInt(headerValue);
} }
whiteSpaceOnly = true; whiteSpaceOnly = true;

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
View File

@ -463,7 +463,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
@Override @Override
public String getFirstMessageAsJSON() throws Exception { public String getFirstMessageAsJSON() throws Exception {
return toJSON(getFirstMessage()).toString(); return toJSON(getFirstMessage());
} }
@Override @Override

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -1127,7 +1127,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
int sessionCount = 0; int sessionCount = 0;
for (Entry<String, ServerSession> sessionEntry : sessions.entrySet()) { for (Entry<String, ServerSession> sessionEntry : sessions.entrySet()) {
if (sessionEntry.getValue().getUsername().toString().equals(username)) { if (sessionEntry.getValue().getUsername().equals(username)) {
sessionCount++; sessionCount++;
} }
} }