[bookkeeper] branch master updated: Fix for BookKeeperBuildersTest

[eo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 7254090  Fix for BookKeeperBuildersTest
7254090 is described below

commit 7254090d6a822e3c9c244c46fdb354bf56ddb2f3
Author: Ivan Kelly <iv...@midokura.com>
AuthorDate: Wed Oct 18 09:15:40 2017 +0200

    Fix for BookKeeperBuildersTest
    
    Previous findbugs fix broke it.
    
    Author: Ivan Kelly <iv...@midokura.com>
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>, Sijie Guo <si...@apache.org>
    
    This closes #638 from ivankelly/bkbuildertest-fail
---
 .../src/main/java/org/apache/bookkeeper/client/SyncCallbackUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/SyncCallbackUtils.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/SyncCallbackUtils.java
index 6b6c7d8..822d327 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/SyncCallbackUtils.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/SyncCallbackUtils.java
@@ -111,7 +111,7 @@ class SyncCallbackUtils {
          */
         @Override
         public void createComplete(int rc, LedgerHandle lh, Object ctx) {
-            if (lh instanceof LedgerHandleAdv) {
+            if (lh == null || lh instanceof LedgerHandleAdv) {
                 finish(rc, (LedgerHandleAdv) lh, future);
             } else {
                 finish(BKException.Code.UnexpectedConditionException, null, future);
@@ -312,4 +312,4 @@ class SyncCallbackUtils {
         }
     }
 
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
['"commits@bookkeeper.apache.org" <co...@bookkeeper.apache.org>'].