ACCUMULO-2292 Fix a potential bug in the InputFormat that I introduced.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f4c5005 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f4c5005 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f4c5005 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 8f4c5005d43551e07399a0aaccd705ee982fe754 Parents: 01cb310 Author: Josh Elser <els...@apache.org> Authored: Mon Feb 3 21:33:10 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 3 21:33:10 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/mapred/InputFormatBase.java | 2 +- .../org/apache/accumulo/core/client/mapreduce/InputFormatBase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f4c5005/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java index 8cc4d18..ae361de 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java @@ -619,7 +619,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> { Connector conn = instance.getConnector(principal, token); log.debug("Creating scanner for table: " + table); log.debug("Authorizations are: " + authorizations); - if (isOfflineScan(job)) { + if (isOffline) { String tokenClass = token.getClass().getCanonicalName(); ByteBuffer tokenBuffer = ByteBuffer.wrap(CredentialHelper.toBytes(token)); scanner = new OfflineScanner(instance, new TCredentials(principal, tokenClass, tokenBuffer, instance.getInstanceID()), Tables.getTableId(instance, http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f4c5005/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java index 4c57d1d..cc5071c 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java @@ -631,7 +631,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> { Connector conn = instance.getConnector(principal, token); log.debug("Creating scanner for table: " + table); log.debug("Authorizations are: " + authorizations); - if (isOfflineScan(attempt)) { + if (isOffline) { String tokenClass = token.getClass().getCanonicalName(); ByteBuffer tokenBuffer = ByteBuffer.wrap(CredentialHelper.toBytes(token)); scanner = new OfflineScanner(instance, new TCredentials(principal, tokenClass, tokenBuffer, instance.getInstanceID()), Tables.getTableId(instance,
