Author: chirino
Date: Fri Jan 27 02:12:10 2012
New Revision: 1236490
URL: http://svn.apache.org/viewvc?rev=1236490&view=rev
Log:
Fixes the transaction test. On rollback the jms client introduces a 1 second
delay.
Modified:
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/DestinationConverter.scala
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/TransactionTest.scala
Modified:
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/DestinationConverter.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/DestinationConverter.scala?rev=1236490&r1=1236489&r2=1236490&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/DestinationConverter.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/DestinationConverter.scala
Fri Jan 27 02:12:10 2012
@@ -16,12 +16,10 @@
*/
package org.apache.activemq.apollo.openwire
-import java.util.regex.{Matcher, Pattern}
import org.apache.activemq.apollo.dto.{TopicDestinationDTO,
QueueDestinationDTO, DestinationDTO}
import org.apache.activemq.apollo.broker.DestinationParser
-import org.fusesource.hawtbuf.Buffer.utf8
import org.apache.activemq.apollo.openwire.command._
-import org.fusesource.hawtbuf._
+import org.apache.activemq.apollo.util.path.PathParser._
/**
* <p>
Modified:
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1236490&r1=1236489&r2=1236490&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
Fri Jan 27 02:12:10 2012
@@ -40,6 +40,7 @@ import org.apache.activemq.apollo.broker
import protocol._
import security.SecurityContext
import DestinationConverter._
+import org.apache.activemq.apollo.util.path.PathParser._
object OpenwireProtocolHandler extends Log {
def unit:Unit = {}
Modified:
activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/TransactionTest.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/TransactionTest.scala?rev=1236490&r1=1236489&r2=1236490&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/TransactionTest.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/TransactionTest.scala
Fri Jan 27 02:12:10 2012
@@ -46,7 +46,7 @@ class TransactionTest extends OpenwireTe
m2.getText should equal (messages(1).getText)
consumer_session.rollback
- m2 = consumer.receive(1000).asInstanceOf[TextMessage]
+ m2 = consumer.receive(2000).asInstanceOf[TextMessage]
m2 should not be (null)
m2.getText should equal (messages(1).getText)
consumer_session.commit
