You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2013/10/02 01:45:22 UTC
svn commit: r1528271 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java
src/java/test/data/invalidsnap/version-2/snapshot.273
src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java
Author: phunt
Date: Tue Oct 1 23:45:22 2013
New Revision: 1528271
URL: http://svn.apache.org/r1528271
Log:
ZOOKEEPER-1770. NullPointerException in SnapshotFormatter (Germán Blanco via phunt)
Added:
zookeeper/trunk/src/java/test/data/invalidsnap/version-2/snapshot.273 (with props)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1528271&r1=1528270&r2=1528271&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Oct 1 23:45:22 2013
@@ -400,6 +400,9 @@ BUGFIXES:
ZOOKEEPER-1655. Make jline dependency optional in maven pom
(Thomas Weise via phunt)
+ ZOOKEEPER-1770. NullPointerException in SnapshotFormatter
+ (Germán Blanco via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java?rev=1528271&r1=1528270&r2=1528271&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java Tue Oct 1 23:45:22 2013
@@ -87,7 +87,11 @@ public class SnapshotFormatter {
synchronized(n) { // keep findbugs happy
System.out.println(name);
printStat(n.stat);
- System.out.println(" dataLength = " + n.data.length);
+ if (n.data != null) {
+ System.out.println(" dataLength = " + n.data.length);
+ } else {
+ System.out.println(" no data");
+ }
children = n.getChildren();
}
if (children != null) {
Added: zookeeper/trunk/src/java/test/data/invalidsnap/version-2/snapshot.273
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/data/invalidsnap/version-2/snapshot.273?rev=1528271&view=auto
==============================================================================
Binary file - no diff available.
Propchange: zookeeper/trunk/src/java/test/data/invalidsnap/version-2/snapshot.273
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java?rev=1528271&r1=1528270&r2=1528271&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java Tue Oct 1 23:45:22 2013
@@ -71,6 +71,17 @@ public class InvalidSnapshotTest extends
}
/**
+ * Verify the SnapshotFormatter by running it on a known file with one null data.
+ */
+ @Test
+ public void testSnapshotFormatterWithNull() throws Exception {
+ File snapDir = new File(testData, "invalidsnap");
+ File snapfile = new File(new File(snapDir, "version-2"), "snapshot.273");
+ String[] args = {snapfile.getCanonicalFile().toString()};
+ SnapshotFormatter.main(args);
+ }
+
+ /**
* test the snapshot
* @throws Exception an exception could be expected
*/