svn commit: r1155972 - in /qpid/trunk/qpid/java: common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java module.xml
Author: robbie
Date: Tue Aug 9 23:36:45 2011
New Revision: 1155972
URL: http://svn.apache.org/viewvc?rev=1155972&view=rev
Log:
QPID-3402: revert r1155516, bad things happened without space
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/module.xml
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1155972&r1=1155971&r2=1155972&view=diff
==
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
Tue Aug 9 23:36:45 2011
@@ -59,7 +59,7 @@ public class QpidTestCase extends TestCa
String exclusionListString =
System.getProperties().getProperty("test.excludelist", "");
List exclusionList = new ArrayList();
-for (String uri : exclusionListURIs.split(";\\s+"))
+for (String uri : exclusionListURIs.split("\\s+"))
{
File file = new File(uri);
if (file.exists())
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1155972&r1=1155971&r2=1155972&view=diff
==
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Tue Aug 9 23:36:45 2011
@@ -316,7 +316,7 @@
-
+
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1155572 - /qpid/trunk/qpid/cpp/src/tests/federated_topic_test
Author: astitcher
Date: Tue Aug 9 22:02:10 2011
New Revision: 1155572
URL: http://svn.apache.org/viewvc?rev=1155572&view=rev
Log:
NO-JIRA: Fixed obsolete federation test to carry on working
- probably should be removed instead
Modified:
qpid/trunk/qpid/cpp/src/tests/federated_topic_test
Modified: qpid/trunk/qpid/cpp/src/tests/federated_topic_test
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/federated_topic_test?rev=1155572&r1=1155571&r2=1155572&view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/federated_topic_test (original)
+++ qpid/trunk/qpid/cpp/src/tests/federated_topic_test Tue Aug 9 22:02:10 2011
@@ -42,13 +42,12 @@ while getopts "s:m:b:" opt ; do
esac
done
-MY_DIR=$(dirname $(which $0))
source ./test_env.sh
trap stop_brokers EXIT
start_broker() {
-${MY_DIR}/../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth
no > qpidd.port
+$QPIDD_EXEC --daemon --port 0 --no-module-dir --no-data-dir --auth no >
qpidd.port
}
start_brokers() {
@@ -76,39 +75,39 @@ subscribe() {
echo Subscriber $1 connecting on $MY_PORT
LOG="subscriber_$1.log"
-${MY_DIR}/topic_listener -p $MY_PORT > $LOG 2>&1 && rm -f $LOG
+./qpid-topic-listener -p $MY_PORT > $LOG 2>&1 && rm -f $LOG
}
publish() {
-${MY_DIR}/topic_publisher --messages $MESSAGES --batches $BATCHES
--subscribers $SUBSCRIBERS -p $PORT_A
+./qpid-topic-publisher --messages $MESSAGES --batches $BATCHES
--subscribers $SUBSCRIBERS -p $PORT_A
}
setup_routes() {
-BROKER_A="localhost:$PORT_A"
-BROKER_B="localhost:$PORT_B"
-BROKER_C="localhost:$PORT_C"
+BROKER_A="daffodil:$PORT_A"
+BROKER_B="daffodil:$PORT_B"
+BROKER_C="daffodil:$PORT_C"
if (($VERBOSE)); then
echo "Establishing routes for topic..."
fi
-$PYTHON_COMMANDS/qpid-route route add $BROKER_B $BROKER_A amq.topic
topic_control B B
-$PYTHON_COMMANDS/qpid-route route add $BROKER_C $BROKER_B amq.topic
topic_control C C
+$QPID_ROUTE_EXEC route add $BROKER_B $BROKER_A amq.topic topic_control B B
+$QPID_ROUTE_EXEC route add $BROKER_C $BROKER_B amq.topic topic_control C C
if (($VERBOSE)); then
echo "linked A->B->C"
fi
-$PYTHON_COMMANDS/qpid-route route add $BROKER_B $BROKER_C amq.topic
topic_control B B
-$PYTHON_COMMANDS/qpid-route route add $BROKER_A $BROKER_B amq.topic
topic_control A A
+$QPID_ROUTE_EXEC route add $BROKER_B $BROKER_C amq.topic topic_control B B
+$QPID_ROUTE_EXEC route add $BROKER_A $BROKER_B amq.topic topic_control A A
if (($VERBOSE)); then
echo "linked C->B->A"
echo "Establishing routes for response queue..."
fi
-$PYTHON_COMMANDS/qpid-route route add $BROKER_B $BROKER_C amq.direct
response B B
-$PYTHON_COMMANDS/qpid-route route add $BROKER_A $BROKER_B amq.direct
response A A
+$QPID_ROUTE_EXEC route add $BROKER_B $BROKER_C amq.direct response B B
+$QPID_ROUTE_EXEC route add $BROKER_A $BROKER_B amq.direct response A A
if (($VERBOSE)); then
echo "linked C->B->A"
for b in $BROKER_A $BROKER_B $BROKER_C; do
echo "Routes for $b"
-$PYTHON_COMMANDS/qpid-route route list $b
+$QPID_ROUTE_EXEC route list $b
done
fi
}
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1155545 - in /qpid/trunk/qpid: cpp/src/qpid/broker/Broker.cpp cpp/src/qpid/cluster/UpdateClient.cpp cpp/src/tests/federation_sys.py tests/src/py/qpid_tests/broker_0_10/exchange.py
Author: gsim
Date: Tue Aug 9 20:19:54 2011
New Revision: 1155545
URL: http://svn.apache.org/viewvc?rev=1155545&view=rev
Log:
QPID-3363: prevent bind/unbind on default exchange
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
qpid/trunk/qpid/cpp/src/tests/federation_sys.py
qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1155545&r1=1155544&r2=1155545&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Tue Aug 9 20:19:54 2011
@@ -916,6 +916,9 @@ void Broker::bind(const std::string& que
if
(!acl->authorise(userId,acl::ACT_BIND,acl::OBJ_EXCHANGE,exchangeName,¶ms))
throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied
exchange bind request from " << userId));
}
+if (exchangeName.empty()) {
+throw framing::NotAllowedException(QPID_MSG("Bind not allowed for
default exchange"));
+}
Queue::shared_ptr queue = queues.find(queueName);
Exchange::shared_ptr exchange = exchanges.get(exchangeName);
@@ -946,13 +949,15 @@ void Broker::unbind(const std::string& q
if
(!acl->authorise(userId,acl::ACT_UNBIND,acl::OBJ_EXCHANGE,exchangeName,¶ms)
)
throw framing::UnauthorizedAccessException(QPID_MSG("ACL denied
exchange unbind request from " << userId));
}
-
+if (exchangeName.empty()) {
+throw framing::NotAllowedException(QPID_MSG("Unbind not allowed for
default exchange"));
+}
Queue::shared_ptr queue = queues.find(queueName);
Exchange::shared_ptr exchange = exchanges.get(exchangeName);
if (!queue) {
-throw framing::NotFoundException(QPID_MSG("Bind failed. No such queue:
" << queueName));
+throw framing::NotFoundException(QPID_MSG("Unbind failed. No such
queue: " << queueName));
} else if (!exchange) {
-throw framing::NotFoundException(QPID_MSG("Bind failed. No such
exchange: " << exchangeName));
+throw framing::NotFoundException(QPID_MSG("Unbind failed. No such
exchange: " << exchangeName));
} else {
if (exchange->unbind(queue, key, 0)) {
if (exchange->isDurable() && queue->isDurable()) {
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp?rev=1155545&r1=1155544&r2=1155545&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp Tue Aug 9 20:19:54
2011
@@ -402,7 +402,11 @@ void UpdateClient::updateNonExclusiveQue
}
void UpdateClient::updateBinding(client::AsyncSession& s, const std::string&
queue, const QueueBinding& binding) {
-s.exchangeBind(queue, binding.exchange, binding.key, binding.args);
+if (binding.exchange.size())
+s.exchangeBind(queue, binding.exchange, binding.key, binding.args);
+//else its the default exchange and there is no need to replicate
+//the binding, the creation of the queue will have done so
+//automatically
}
void UpdateClient::updateOutputTask(const sys::OutputTask* task) {
Modified: qpid/trunk/qpid/cpp/src/tests/federation_sys.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/federation_sys.py?rev=1155545&r1=1155544&r2=1155545&view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/federation_sys.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/federation_sys.py Tue Aug 9 20:19:54 2011
@@ -574,7 +574,7 @@ class QmfTestBase010(TestBase010):
def _do_test(self,
test_name, # Name of test
- exch_name = "",# Remote exchange name
+ exch_name = "amq.direct", # Remote exchange name
exch_type = "direct", # Remote exchange type
exch_alt_exch = "",# Remote exchange
alternate exchange
exch_alt_exch_type = "direct", # Remote exchange
alternate exchange type
@@ -726,23 +726,6 @@ class B_LongTransactionTests(QmfTestBase
self._do_test(self._get_name(), queue_route_type_flag=True,
enq_txn_size=10, msg_count = 103)
-def test_txEnq01_route_amqDirectExch(self):
-self._do_test(self._get_name(), exch_name="amq.direct", enq_txn_size=1)
-
-def test_txEnq01_queueRoute_amqDirectExch(self):
-self._do_test(self._get_name(), exch_name="amq.direct",
queue_route_type_flag=True, enq_txn_size=1)
-
-def test_txEnq10_route_amqDirec
svn commit: r1155516 - in /qpid/trunk/qpid/java: common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java module.xml
Author: robbie
Date: Tue Aug 9 19:40:41 2011
New Revision: 1155516
URL: http://svn.apache.org/viewvc?rev=1155516&view=rev
Log:
QPID-3402: also use a semi-colon deliminator instead of just whitespace, so as
to allow identifying the excludes files correctly when the directory structure
includes spaces
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/module.xml
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1155516&r1=1155515&r2=1155516&view=diff
==
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
Tue Aug 9 19:40:41 2011
@@ -59,7 +59,7 @@ public class QpidTestCase extends TestCa
String exclusionListString =
System.getProperties().getProperty("test.excludelist", "");
List exclusionList = new ArrayList();
-for (String uri : exclusionListURIs.split("\\s+"))
+for (String uri : exclusionListURIs.split(";\\s+"))
{
File file = new File(uri);
if (file.exists())
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1155516&r1=1155515&r2=1155516&view=diff
==
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Tue Aug 9 19:40:41 2011
@@ -316,7 +316,7 @@
-
+
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1155494 - /qpid/trunk/qpid/KEYS
Author: jross Date: Tue Aug 9 19:09:01 2011 New Revision: 1155494 URL: http://svn.apache.org/viewvc?rev=1155494&view=rev Log: QPID-3331: Add my code-signing key Modified: qpid/trunk/qpid/KEYS Modified: qpid/trunk/qpid/KEYS URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/KEYS?rev=1155494&r1=1155493&r2=1155494&view=diff == --- qpid/trunk/qpid/KEYS (original) +++ qpid/trunk/qpid/KEYS Tue Aug 9 19:09:01 2011 @@ -371,3 +371,58 @@ EAAKCRCFx21QqdfQx+2MAKDPilVZy0YNhW5fIvA/ jvJP5xcF6/EBpys= =Wc+j -END PGP PUBLIC KEY BLOCK- +pub 4096R/C6B459DB 2011-07-18 +uid Justin Ross (CODE SIGNING KEY) +sub 4096R/95BB2C1A 2011-07-18 +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v2.0.17 (GNU/Linux) + +mQINBE4kjewBEADSfPSpx+dZqdopNR8h/QG6jFDL9stuTQkLN0y9VEo+PEX4wzR6 +npzxcjVZF0ZBGOZl6DT3/SgmOZtFtnH5nb3ebpFEaalktyC9K4rFad4QW3mez7+x +Slsb6DEx0l6PFU9FM97RI7MLMfkkYuAsWqO1kDdLaY7XeFg0a05OA0d/i7qCl5fR +rAmCKM80SDM23DToWWEVP3Pw8ZYl8KNjc2aTiov/2VdMRZgldJr4EpAkPWk88qGu +s9otP5tKu+aQA/ub6myF295uBtdycvq2DkLUSStSPripADjBcsNswBfITr5inuuQ +g4mIF8pzkRajud4ahZe8mi1hE4K2eyPc2a5Yj1gXM6MPsuNSieSiwlIfj3u+0dRX +74PZzCbPPmmveVWXBFbHBPZs9BwDUBint+1QRk5b0xi3uV/YUuciHQPdjXBcFo8y +fPeZv6vkPHlozXW+wnS7XZqz06fObFPGjpOsTXSiFzd/+9Ecav3tDY7z6UvzRqpN +dU7x0SskEBaU3CS6Av2as5mJ4psaYspSk8goo71JrGZS8hZdALkn6Q6exb1BSEXL +O06N6niNxEf97KAbKvdByfmGMCuombF7My/CwkD6tbhIFO+mGga0AHYkE/F9s3o+ +gWEk/Rfx0jgkiMZWaQqJUYM6XRkNiKjR/QYjbo3eIibCxX8PfKg2iG/tdQARAQAB +tDFKdXN0aW4gUm9zcyAoQ09ERSBTSUdOSU5HIEtFWSkgPGpyb3NzQGFwYWNoZS5v +cmc+iQI4BBMBAgAiBQJOJI3sAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK +CRBkio5XxrRZ2xBpEACS45v7yMgqFzMEAdTb7uOZ6ibZSBD83Xhgraq0Deygt5aZ +zglcegfHufVKC7jmGtWcKYrJ5zwPcclmAut4mc7akPUZYmeSKAcDPhysswvf4vm9 +lNxzwnT83S2bCALK67kj1M2K+U56hP49jCYWCYhoAIb2yRffO/x8EZDmN388Z3ki +6wuD/bfhGKXig04njeWhdJz4asKifbORec4z8R2wIqiOfBy+ObZzQjtXq8CWb2VR +cz0vVQGUCLdD3W2XKryxgzWoJlybCF2+XAx1GJ/zQ/6TDLm2P1kVX285/pcOVAUM +Ca1IHf70z1SOjAI7KfH9ewgZoMJMqIauDxf2YNejntj9tyd5i4i1h1upeDD7mI79 +c1kBZfYDDJhqlbgPfSnBX46xEXY2Vh9hHmIeLzNpaMQhGgFVwLKQdNOjDN4WcaoV +pKQf/ZZ6dzBkzTZni7j11DxIgCIu64qgzqlBI2xYmxNzkF/1hVVkHsrZ82TpFcKM +ejmq3NKtQMvt9TeJwRe+NVdF19bpszk7FnxYWfiokP7SJcjBDnuXah8ScEk2Fa3D +Q41Rpg3q6e3Gc7ehfhZsUNlstQ/zEVfg3Dj9lkkMm2Jx13S+bHobgXbNIG23Kv+N +vfKqtoRKrJwujgdy0KgyeMUSTYKVxgjK9nbOZtNbFMn0rYTnKjdTt//DzZ5We7kC +DQROJI3sARAA2wHTgOEYWLHhJPOzuM5nEnPTMTTSymo31dePqUEGM/5Gxcl+GXwK +0RCvV4Hlaju7fR8SB2wbVqZDRACqynw7aSGxr327ebvCOKc/9d5R9aK2qRisoN9b +wIq2IzboLDC8PKEZsFyOUcEirt0q8k05cC8S9nx5LG5ddeIcIyXwKUYLLgOeUgre +Drzm2R+6N28C1AcXL7V8pDEfy5sd1tslMsV9khtF1hqxaW9nRKt/7qGsI+ALmwyz +QwV54GPLs1LUJX7vlEbl3gUbmrgdCk1eYP/KloZJFMlwgB+EUoWFrboy+BAxUBwJ +xk4y+Dqu9GLnNYo8MrTvL6QAFdoscAPFThZRndQ/MfOvCNz/0Yima7AKOPoQXDFB +zhjR8lv8A12mmnegHpkV9P4isT6c5Tc5TPbCBqnOId2buLm2V7f3kgH5dPgPEO0z +P3SPe39mJNSLWtrqpi89EQI+cD/JhyemgTNJOYqjLnnrsyaPXYClVR05nW3g7Bmh +9UO/5L82Mi8LFZXFO23L/JRvpvh529f7fPpMv4KiJiU5Gc2LJ3/HAYDIp/4q3ETF +TboPEAP7WW0BLVkl37LkhJ/uD7/COFlTolgsNqtIZtRr6m8/PeLPYXfOwKNSmhz2 +CqW7RSIiyqwdFtyfyR0RpDAYissaRpMgqU/6r49OsZIOLImkJI33M7sAEQEAAYkC +HwQYAQIACQUCTiSN7AIbDAAKCRBkio5XxrRZ20o4EACnL2xNHpRZQm4L+qB/Lanz +2GONIKqdFzRls/6WlqOS+/loylorF3hVo8aJe13bJtf8LIoBTViFUq8BCBEb1Q3S +qmmlzfiMeTZtCK9WbfqC07iEe/KUNmxjA/ZR6sE9x8Pe+QI0mnXZBKHexLsjdpav +hdwHi5EmAE8gEiY7PwbJmxq+JXxKWrhyPscn3TIQrs6F+0KMs61XVPsflN0Tfzvf +7hJ8Zn7HGjGsa+g6XmiEoZMDWwZDQVZby+g95EE9iyAwT6tlNqNGgHS8QKL9zFo0 +cxCntJYMQhYHKsd744Tfq01i3EEFIUMqGc/md0Ra/E5bG563VfbvBOpDobiX1KX1 +wRIMo5StjjFVzZj7Zyj73ALSQ5mfSvzJqsXRYpoPdy6bHJj3nSBrswpjpl+WsVOR +oe6o73mM3CB6r10YMITa+aEmSQGAFSwajpDAfqbSQRbIGq0K+hqyCMzZ7qqv2b0+ +U1N6jUaWBFLMNiti+jw6TRUcdQstagb6qYqpF5MQ+NU7ddxNgIiRByeoFR9vMIfT +wFtVHi7IN8OM6rvshjc/rmOEiSPCULSvpI1vq14MfRAWfyeqkxrvuklbdMOeJwSP +U6nOKyS2R4/y+0s1J85amn4YHTUhOHYRnQAEckX8DB0UtCP15FSmrN3aOBp7hbvm +MxumwmEHVDFpDpKCCnJa9A== +=Uryx +-END PGP PUBLIC KEY BLOCK- - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
[CONF] Apache Qpid > 0.12 Release
0.12 Release Page edited by Justin Ross Comment: Add link to release distribution Changes (2) ... h2. Status - 8 August: Release distribution produced at revision 1154981 - 21 July: RC2 cut from release branch at revision 1149268 - 14 July: RC1 cut from release branch at revision 1146605 ... | RC1 | [http://people.apache.org/~jross/qpid-0.12-rc1/] | | RC2 | [http://people.apache.org/~jross/qpid-0.12-rc2/] | | Release | [http://people.apache.org/~jross/qpid-0.12/] | h2. Links ... Full Content 0.12 Release Status 8 August: Release distribution produced at revision 1154981 21 July: RC2 cut from release branch at revision 1149268 14 July: RC1 cut from release branch at revision 1146605 30 June: Beta cut from release branch at revision 1141708 30 June: Release branch created at trunk revision 1141543 20 June: Alpha is cut at trunk revision 1137034 Issues Features and improvements http://bit.ly/hMr9Wz Candidate features and improvements http://bit.ly/gHo6to Open bugs http://bit.ly/huV9AE Fixed bugs http://bit.ly/rirUBz Distributions Alpha http://people.apache.org/~jross/qpid-0.12-alpha/ Beta http://people.apache.org/~jross/qpid-0.12-beta/ RC1 http://people.apache.org/~jross/qpid-0.12-rc1/ RC2 http://people.apache.org/~jross/qpid-0.12-rc2/ Release http://people.apache.org/~jross/qpid-0.12/ Links Release branch http://svn.apache.org/repos/asf/qpid/branches/0.12/ http://svn.apache.org/viewvc/qpid/branches/0.12/ Schedule 15 June Alpha Major feature integration ends; with approval, certain less disruptive features can be committed Trunk remains open for bug fixing The alpha release tests the release process after the introduction of major features 29 June, 2 weeks later Beta The release branch is created Trunk opens for development toward the next release Release branch commits require approval Release manager produces outstanding bug report and triages bugs 13 July, 2 weeks later RC1 20 July, 1 week later RC2 27 July, 1 week later RC3 Targeted release date Change Notification Preferences View Online | View Changes | Add Comment - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1155381 - /qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
Author: gsim Date: Tue Aug 9 14:18:52 2011 New Revision: 1155381 URL: http://svn.apache.org/viewvc?rev=1155381&view=rev Log: QPID-3400: remove redundant delivery records on release Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=1155381&r1=1155380&r2=1155381&view=diff == --- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Tue Aug 9 14:18:52 2011 @@ -693,6 +693,10 @@ void SemanticState::release(DeliveryId f DeliveryRecords::reverse_iterator start(range.end); DeliveryRecords::reverse_iterator end(range.start); for_each(start, end, boost::bind(&DeliveryRecord::release, _1, setRedelivered)); + +DeliveryRecords::iterator removed = +remove_if(range.start, range.end, bind(&DeliveryRecord::isRedundant, _1)); +unacked.erase(removed, range.end); } void SemanticState::reject(DeliveryId first, DeliveryId last) - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1155373 - /qpid/trunk/qpid/java/test-profiles/Java010Excludes
Author: robbie Date: Tue Aug 9 14:05:14 2011 New Revision: 1155373 URL: http://svn.apache.org/viewvc?rev=1155373&view=rev Log: QPID-3392: correct JIRA reference Modified: qpid/trunk/qpid/java/test-profiles/Java010Excludes Modified: qpid/trunk/qpid/java/test-profiles/Java010Excludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/Java010Excludes?rev=1155373&r1=1155372&r2=1155373&view=diff == --- qpid/trunk/qpid/java/test-profiles/Java010Excludes (original) +++ qpid/trunk/qpid/java/test-profiles/Java010Excludes Tue Aug 9 14:05:14 2011 @@ -82,6 +82,6 @@ org.apache.qpid.test.client.destination. // QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs. org.apache.qpid.server.failover.FailoverMethodTest#* -// QPID-3092: the Java broker does not yet implement exchange creation arguments +// QPID-3392: the Java broker does not yet implement exchange creation arguments org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithArgs org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testSessionCreateTopicWithExchangeArgs - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
