chirino

diff --git a/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java b/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java
index afb7e35..d6a360c 100644
--- a/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java
+++ b/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java
@@ -237,25 +237,30 @@ public class AmqpTransport extends WatchBase {
                     }
                     HashSet<String> mechanisims = new HashSet<String>(Arrays.asList(sasl.getRemoteMechanisms()));
                     if (!authSent && !mechanisims.isEmpty()) {
-                        if (!mechanisims.contains("PLAIN")) {
+                        if (mechanisims.contains("PLAIN")) {

chirino

   <dependency>
      <groupId>org.xerial.snappy</groupId>
      <artifactId>snappy-java</artifactId>
      <version>1.1.0-M3</version>
    </dependency>
    <dependency>
      <groupId>org.iq80.snappy</groupId>
      <artifactId>snappy</artifactId>
      <version>0.2</version>
    </dependency>

chirino

(ACTIVEMQ) Rendering Blog Entry ActiveMQ 2.1 Released with high performance journalling    (1/70)
org.apache.velocity.exception.MethodInvocationException: Invocation of method 'unwrap' in  class org.apache.cxf.cwiki.SiteExporter threw exception java.lang.NullPointerException at file:/Users/chirino/sandbox/activemq-website/template/template.vm[line 71, column 27]
  at org.apache.velocity.runtime.parser.node.ASTMethod.handleInvocationException(ASTMethod.java:243)
	at org.apache.velocity.runtime.parser.node.ASTMethod.execute(ASTMethod.java:187)
	at org.apache.velocity.runtime.parser.node.ASTReference.execute(ASTReference.java:280)
	at org.apache.velocity.runtime.parser.node.ASTReference.value(ASTReference.java:567)
	at org.apache.velocity.runtime.parser.node.ASTExpression.value(ASTExpression.java:71)
	at org.apache.velocity.runtime.parser.node.ASTSetDirective.render(ASTSetDirective.java:142)
	at org.apache.velocity.runtime.parser.node.SimpleNode.render(SimpleNode.java:342)
	at org.apache.velocity.Template.merge(

chirino

Caused by: javax.jms.MessageFormatException: Only objectified primitive objects, String, Map and List types are allowed but was: 1 type: class org.apache.qpid.proton.amqp.UnsignedInteger
  at org.apache.activemq.command.ActiveMQMessage.checkValidObject(ActiveMQMessage.java:521)
	at org.apache.activemq.command.ActiveMQMessage.setObjectProperty(ActiveMQMessage.java:487)
	at org.apache.activemq.command.ActiveMQMessage.setObjectProperty(ActiveMQMessage.java:475)
	at org.apache.activemq.command.ActiveMQBytesMessage.setObjectProperty(ActiveMQBytesMessage.java:896)
	at org.apache.qpid.proton.jms.InboundTransformer.setProperty(InboundTransformer.java:265)
	at org.apache.qpid.proton.jms.InboundTransformer.populateMessage(InboundTransformer.java:168)
	at org.apache.qpid.proton.jms.AMQPNativeInboundTransformer.transform(AMQPNativeInboundTransformer.java:37)
	at org.apache.activemq.transport.amqp.AmqpProtocolConverter$ProducerContext.onMessage(AmqpProtocolConverter.java:508)
	at org.apache.activemq.transport.amqp.AmqpPro

chirino

commit f08d0809489869322d0fbb199313a7ba33dfb9b5
Author: Hiram Chirino <hiram@hiramchirino.com>
Date:   Fri May 31 14:17:57 2013 -0400

    Fix for AMQ-4563: Changes the KahaDB store to use a more consistent key for message ids.  MessageId.toString can change depending on how the message was encoded.

diff --git a/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
index f0f2c62..9d77161 100755
--- a/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java

chirino

commit 402ebb0ebc9c89b7c42febe282e05473b9a2482e
Author: Hiram Chirino <hiram@hiramchirino.com>
Date:   Fri May 31 14:24:41 2013 -0400

    Additional fix for AMQ-4563: Support storing the externally generated message id of a message in the MessageID class so that Selectors can operate against that external message id.

diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
index 97a620a..a718a97 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java

chirino

commit f7f808c6e477822e3b85a9b0ab1d73e6d033966f
Author: Hiram Chirino <hiram@hiramchirino.com>
Date:   Fri May 31 14:17:57 2013 -0400

    Fix for AMQ-4563: Changes the KahaDB store to index messages by the broker sequence id instead of the message id since that can change depending on how the message was encoded.

diff --git a/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java b/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
index 9981460..f1c7cbc 100755
--- a/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/MessageId.java

chirino

package example

import org.vertx.java.core._
import org.vertx.java.core.buffer._
import org.vertx.java.core.http._
import scala.concurrent._
import scala.concurrent.duration._
import scala.async.Async.{async, await}
import scala.util.{Try,Success,Failure}
import scala.concurrent.duration._

chirino

package example

import org.vertx.java.core._
import org.vertx.java.core.buffer._
import org.vertx.java.core.http._
import scala.concurrent._
import scala.concurrent.duration._
import scala.async.Async.{async, await}
import scala.util.{Try,Success,Failure}
import scala.concurrent.duration._

chirino

Found one Java-level deadlock:
=============================
"consumer 0 closer":
  waiting to lock monitor 0x00007f038c018b28 (object 0x00007f04653e7740, a java.lang.Object),
  which is held by "consumer 0 worker"
"consumer 0 worker":
  waiting to lock monitor 0x00007f038c08fb80 (object 0x00007f04653ad348, a java.lang.Object),
  which is held by "consumer 0 closer"

Java stack information for the threads listed above: