Created attachment 629242 [details] trivial patch Trivial patch for qpid 0.18: instead of waiting 10 seconds during shutdown, --wait option is taken into account. One further documentation fix for the same is included.
Approving this for 2.4, but keep in mind that the command line interface may change.
Compiles and works on trunk. Note: the patch is reversed so use the -R option on the patch command line to apply.
Fixed upstream at Committed revision 1471442.
Tested on RHEL6.4 (both i386 x86_64). This feature was implemented and works as expected. When the qpidd is started with the options "-q --wait N", it waits for N seconds for the running qpidd broker to shut down. Packages used for testing: python-qpid-0.22-4.el6 python-qpid-qmf-0.22-6.el6 qpid-cpp-client-0.22-7.el6 qpid-cpp-client-devel-0.22-7.el6 qpid-cpp-client-devel-docs-0.22-7.el6 qpid-cpp-client-rdma-0.22-7.el6 qpid-cpp-client-ssl-0.22-7.el6 qpid-cpp-server-0.22-7.el6 qpid-cpp-server-devel-0.22-7.el6 qpid-cpp-server-ha-0.22-7.el6 qpid-cpp-server-rdma-0.22-7.el6 qpid-cpp-server-ssl-0.22-7.el6 qpid-cpp-server-store-0.22-7.el6 qpid-cpp-server-xml-0.22-7.el6 qpid-java-client-0.22-4.el6 qpid-java-common-0.22-4.el6 qpid-java-example-0.22-4.el6 qpid-proton-c-0.4-2.2.el6 qpid-qmf-0.22-6.el6 qpid-qmf-devel-0.22-6.el6 qpid-tools-0.22-3.el6 -> VERIFIED
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. http://rhn.redhat.com/errata/RHEA-2014-1296.html