You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/11/21 21:10:52 UTC

svn commit: r1715559 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/contrib/zkfuse/src/zkadapter.cc

Author: rgs
Date: Sat Nov 21 20:10:52 2015
New Revision: 1715559

URL: http://svn.apache.org/viewvc?rev=1715559&view=rev
Log:
ZOOKEEPER-1929: std::length_error on update children
(Charles Strahan via rgs)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/contrib/zkfuse/src/zkadapter.cc

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1715559&r1=1715558&r2=1715559&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Nov 21 20:10:52 2015
@@ -56,6 +56,9 @@ BUGFIXES:
   ZOOKEEPER-2229: Several four-letter words are undocumented
   (Chris Nauroth via rgs)
 
+  ZOOKEEPER-1929: std::length_error on update children
+  (Charles Strahan via rgs)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests

Modified: zookeeper/branches/branch-3.5/src/contrib/zkfuse/src/zkadapter.cc
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/contrib/zkfuse/src/zkadapter.cc?rev=1715559&r1=1715558&r2=1715559&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/contrib/zkfuse/src/zkadapter.cc (original)
+++ zookeeper/branches/branch-3.5/src/contrib/zkfuse/src/zkadapter.cc Sat Nov 21 20:10:52 2015
@@ -845,7 +845,10 @@ ZooKeeperAdapter::getNodeData(const stri
             string("Unable to get data of node ") + path, rc 
         );
     } else {
-        return string( buffer, buffer + len );
+        if (len == -1) {
+            len = 0;
+        }
+        return string( buffer, len );
     }
 }