You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/09/09 16:25:58 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1395 Clean up toString code
Repository: activemq-artemis
Updated Branches:
refs/heads/master 9c31055ab -> 1e28b2953
ARTEMIS-1395 Clean up toString code
Clean up toString code and properly log error message.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8dddc737
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8dddc737
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8dddc737
Branch: refs/heads/master
Commit: 8dddc7370c9f2af1354d03fadc206c852d94077c
Parents: 9c31055
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Sep 8 12:44:07 2017 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 8 12:44:07 2017 -0400
----------------------------------------------------------------------
.../artemis/core/message/impl/CoreMessage.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8dddc737/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index 0428a58..516addc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
import java.util.LinkedList;
import java.util.Set;
-import io.netty.buffer.ByteBuf;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.ActiveMQException;
@@ -43,6 +42,8 @@ import org.apache.activemq.artemis.utils.UUID;
import org.apache.activemq.artemis.utils.collections.TypedProperties;
import org.jboss.logging.Logger;
+import io.netty.buffer.ByteBuf;
+
/** Note: you shouldn't change properties using multi-threads. Change your properties before you can send it to multiple
* consumers */
public class CoreMessage extends RefCountMessage implements ICoreMessage {
@@ -1066,7 +1067,6 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
initBuffer(size);
buffer.setIndex(0, 0).writeBytes(record.byteBuf(), size);
decode();
-
}
@Override
@@ -1074,8 +1074,6 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
return this;
}
-
-
@Override
public String toString() {
try {
@@ -1084,21 +1082,16 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
", timestamp=" + toDate(getTimestamp()) + ",expiration=" + toDate(getExpiration()) +
", durable=" + durable + ", address=" + getAddress() + ",properties=" + properties + "]@" + System.identityHashCode(this);
} catch (Throwable e) {
- e.printStackTrace();
- System.exit(-1);
+ logger.warn("Error creating String for message: ", e);
return "ServerMessage[messageID=" + messageID + "]";
}
}
-
private static String toDate(long timestamp) {
if (timestamp == 0) {
return "0";
} else {
return new java.util.Date(timestamp).toString();
}
-
}
-
-
}
[2/2] activemq-artemis git commit: This closes #1525
Posted by cl...@apache.org.
This closes #1525
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1e28b295
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1e28b295
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1e28b295
Branch: refs/heads/master
Commit: 1e28b2953a07870d9c9cf3eeb0052f38730e33d9
Parents: 9c31055 8dddc73
Author: Clebert Suconic <cl...@apache.org>
Authored: Sat Sep 9 12:25:51 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Sat Sep 9 12:25:51 2017 -0400
----------------------------------------------------------------------
.../artemis/core/message/impl/CoreMessage.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------