You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/09/30 17:02:05 UTC
svn commit: r1628462 -
/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
Author: gsim
Date: Tue Sep 30 15:02:05 2014
New Revision: 1628462
URL: http://svn.apache.org/r1628462
Log:
QPID-6127: slight refactoring of previous solution for brevity; suggested by Andrew Stitcher.
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp?rev=1628462&r1=1628461&r2=1628462&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp Tue Sep 30 15:02:05 2014
@@ -34,6 +34,7 @@
#include "qpid/framing/MessageProperties.h"
#include "qpid/framing/MessageTransferBody.h"
#include "qpid/framing/enum.h"
+#include <algorithm>
namespace qpid {
namespace client {
@@ -131,15 +132,8 @@ qpid::sys::Duration get_duration(qpid::s
{
if (timeout == qpid::sys::TIME_INFINITE) {
return qpid::sys::TIME_INFINITE;
- } else if (timeout == 0) {
- return 0;
} else {
- qpid::sys::AbsTime n = AbsTime::now();
- if (n < deadline) {
- return qpid::sys::Duration(n, deadline);
- } else {
- return 0;
- }
+ return std::max(qpid::sys::Duration(0), qpid::sys::Duration(AbsTime::now(), deadline));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org