[kudu] branch master updated: java: fix logical conflict of timeoutTracker

[adar]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0d51764  java: fix logical conflict of timeoutTracker
0d51764 is described below

commit 0d5176412208304630a33342452cd0dfff408643
Author: Andrew Wong <aw...@cloudera.com>
AuthorDate: Mon Mar 11 18:32:32 2019 -0700

    java: fix logical conflict of timeoutTracker
    
    This is fallout from merging 7645f5b without rebasing on 8fbf1cc2b.
    
    Change-Id: I2d4ad780390620983d6437c3862a5f6d907788c1
    Reviewed-on: http://gerrit.cloudera.org:8080/12721
    Tested-by: Kudu Jenkins
    Reviewed-by: Adar Dembo <a...@cloudera.com>
---
 .../src/main/java/org/apache/kudu/client/AuthzTokenCache.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/java/kudu-client/src/main/java/org/apache/kudu/client/AuthzTokenCache.java 
b/java/kudu-client/src/main/java/org/apache/kudu/client/AuthzTokenCache.java
index 1dd17e1..fdb2358 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/AuthzTokenCache.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/AuthzTokenCache.java
@@ -153,7 +153,7 @@ public class AuthzTokenCache {
         client.getMasterTable(), tableId, /*name=*/null, client.getTimer(),
         client.getDefaultAdminOperationTimeoutMs(), 
/*requiresAuthzTokenSupport=*/true);
     retrieveAuthzTokenReq.setParentRpc(parentRpc);
-    
retrieveAuthzTokenReq.deadlineTracker.setDeadline(parentRpc.deadlineTracker.getDeadline());
+    
retrieveAuthzTokenReq.timeoutTracker.setTimeout(parentRpc.timeoutTracker.getTimeout());
     numRetrievalsSent.incrementAndGet();
     client.sendRpcToTablet(retrieveAuthzTokenReq).addCallback(cb)
                                                  .addErrback(eb);