Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1401 Numerical overflow fix when using System::nanoTime

This commit is contained in:
Francesco Nigro 2017-09-07 12:25:45 +02:00 committed by Clebert Suconic
parent 65a0c6104a
commit 35c3475092
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
View File

@ -330,7 +330,7 @@ public class NettyConnection implements Connection {
parkNanos = 1000L; parkNanos = 1000L;
} }
boolean canWrite; boolean canWrite;
while (!(canWrite = canWrite(requiredCapacity)) && System.nanoTime() < deadline) { while (!(canWrite = canWrite(requiredCapacity)) && (System.nanoTime() - deadline) < 0) {
//periodically check the connection state //periodically check the connection state
checkConnectionState(); checkConnectionState();
LockSupport.parkNanos(parkNanos); LockSupport.parkNanos(parkNanos);

2
artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
View File

@ -386,7 +386,7 @@ public final class TimedBuffer {
lastFlushTime = System.nanoTime(); lastFlushTime = System.nanoTime();
flush(); flush();
} else if (bufferObserver != null && System.nanoTime() > lastFlushTime + timeout) { } else if (bufferObserver != null && System.nanoTime() - lastFlushTime > timeout) {
lastFlushTime = System.nanoTime(); lastFlushTime = System.nanoTime();
// if not using flush we will spin and do the time checks manually // if not using flush we will spin and do the time checks manually
flush(); flush();

2
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
View File

@ -227,7 +227,7 @@ public class TimedBufferTest extends ActiveMQTestBase {
private static void spinSleep(long timeout) { private static void spinSleep(long timeout) {
if (timeout > 0) { if (timeout > 0) {
final long deadline = System.nanoTime() + timeout; final long deadline = System.nanoTime() + timeout;
while (System.nanoTime() < deadline) { while (System.nanoTime() - deadline < 0) {
//spin wait //spin wait
} }
} }