You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2013/09/02 22:19:27 UTC
svn commit: r1519510 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/contrib/zkfuse/src/zkfuse.cc
Author: fpj
Date: Mon Sep 2 20:19:26 2013
New Revision: 1519510
URL: http://svn.apache.org/r1519510
Log:
ZOOKEEPER-1713. wrong time calculation in zkfuse.cc (german via fpj)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/contrib/zkfuse/src/zkfuse.cc
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1519510&r1=1519509&r2=1519510&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Sep 2 20:19:26 2013
@@ -83,6 +83,8 @@ BUGFIXES:
ZOOKEEPER-1731. Unsynchronized access to ServerCnxnFactory.connectionBeans results in
deadlock. (Dave Latham via camille)
+
+ ZOOKEEPER-1713. wrong time calculation in zkfuse.cc (german via fpj)
IMPROVEMENTS:
Modified: zookeeper/branches/branch-3.4/src/contrib/zkfuse/src/zkfuse.cc
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/contrib/zkfuse/src/zkfuse.cc?rev=1519510&r1=1519509&r2=1519510&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/contrib/zkfuse/src/zkfuse.cc (original)
+++ zookeeper/branches/branch-3.4/src/contrib/zkfuse/src/zkfuse.cc Mon Sep 2 20:19:26 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)