svn commit: r1419496 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java

[fpj]

Author: fpj
Date: Mon Dec 10 15:02:42 2012
New Revision: 1419496

URL: http://svn.apache.org/viewvc?rev=1419496&view=rev
Log:
BOOKKEEPER-498: BookieRecoveryTest.tearDown NPE (fpj)


Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1419496&r1=1419495&r2=1419496&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Dec 10 15:02:42 2012
@@ -130,6 +130,8 @@ Trunk (unreleased changes)
 
        BOOKKEEPER-465: CreateNewLog may overwrite lastLogId with smaller value 
(yixue, fpj via fpj)
 
+       BOOKKEEPER-498: BookieRecoveryTest.tearDown NPE (fpj)
+
       hedwig-protocol:
 
         BOOKKEEPER-394: CompositeException message is not useful (Stu Hood via 
sijie)

Modified: 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java?rev=1419496&r1=1419495&r2=1419496&view=diff
==============================================================================
--- 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
 (original)
+++ 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
 Mon Dec 10 15:02:42 2012
@@ -118,7 +118,9 @@ public class BookieRecoveryTest extends 
     @Override
     public void tearDown() throws Exception {
         // Release any resources used by the BookKeeperTools instance.
-        bkAdmin.close();
+        if(bkAdmin != null){
+            bkAdmin.close();
+        }
         super.tearDown();
     }