Author: grkvlt
Date: Mon Dec 20 16:05:45 2010
New Revision: 1051159
URL: http://svn.apache.org/viewvc?rev=1051159&view=rev
Log:
QPID-2970: use dlq property in tests
Modified:
qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java
qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java
Modified:
qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java?rev=1051159&r1=1051158&r2=1051159&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java
Mon Dec 20 16:05:45 2010
@@ -37,7 +37,8 @@ public class Create extends Client
{
_connection.start();
- BindingURL burl = new AMQBindingURL("direct://amq.direct//" +
_queueName + "?maxdeliverycount='" + _maxRedelivery + "'");
+ BindingURL burl = new AMQBindingURL("direct://amq.direct//" +
_queueName +
+ (_dlq ?
"?maxdeliverycount='" + _maxRedelivery + "'" : ""));
_queue = new AMQQueue(burl);
final Map<String,Object> arguments = new HashMap<String, Object>();
@@ -55,6 +56,7 @@ public class Create extends Client
_queue = _session.createQueue(_queueName +
AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
_consumer = _session.createConsumer(_queue);
while (_consumer.receive(1000) != null);
+ _consumer.close();
}
}
}
Modified:
qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java?rev=1051159&r1=1051158&r2=1051159&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java
Mon Dec 20 16:05:45 2010
@@ -60,7 +60,7 @@ public class Receiver extends Client
_sessionOk = (_transacted || _clientAck) ||
((_sessionType == Session.AUTO_ACKNOWLEDGE || _sessionType ==
Session.DUPS_OK_ACKNOWLEDGE) && _listener);
- _rejectedCheck = (!_sessionOk || _messageIdsDisabled || _maxRedelivery
== 0 || _rejectCount < _maxRedelivery) ? 0 : _count / _reject;
+ _rejectedCheck = (!_dlq || !_sessionOk || _messageIdsDisabled ||
_maxRedelivery == 0 || _rejectCount < _maxRedelivery) ? 0 : _count / _reject;
_consumedCheck = (_count - _rejectedCheck); // + (_sessionOk ?
((_count / _reject) * _rejectCount) : 0);
_consumer = _session.createConsumer(_queue);
@@ -204,4 +204,4 @@ public class Receiver extends Client
{
return _rejectedCheck;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
