Author: fpj
Date: Mon Sep 2 20:22:45 2013
New Revision: 1519511
URL: http://svn.apache.org/r1519511
Log:
ZOOKEEPER-1713. wrong time calculation in zkfuse.cc (german via fpj)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1519511&r1=1519510&r2=1519511&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Sep 2 20:22:45 2013
@@ -365,6 +365,8 @@ BUGFIXES:
RST (Chris Nauroth via phunt)
ZOOKEEPER-1629. testTransactionLogCorruption occasionally fails. (shralex via camille)
+
+ ZOOKEEPER-1713. wrong time calculation in zkfuse.cc (german via fpj)
IMPROVEMENTS:
Modified: zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc?rev=1519511&r1=1519510&r2=1519511&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc (original)
+++ zookeeper/trunk/src/contrib/zkfuse/src/zkfuse.cc Mon Sep 2 20:22:45 2013
@@ -81,7 +81,7 @@ uint64_t secsToMillisecs(uint64_t secs)
inline
uint64_t nanosecsToMillisecs(uint64_t nanosecs)
{
- return nanosecs * 1000000;
+ return nanosecs / 1000000;
}
inline
uint64_t timespecToMillisecs(const struct timespec & ts)
|