diff options
| -rw-r--r-- | qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java | 4 | ||||
| -rw-r--r-- | qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java index 83d5d58d6d..9f34da07e6 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Create.java @@ -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(); } } } diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java index 22f590d893..9961ca0831 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/perftests/dlq/client/Receiver.java @@ -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 +} |