Repository: incubator-blur Updated Branches: refs/heads/master 582eaa854 -> 7734b86fd
Fixing a NPE. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/7734b86f Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/7734b86f Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/7734b86f Branch: refs/heads/master Commit: 7734b86fd5885d6d57cd1cf56e46d742f29792b7 Parents: 582eaa8 Author: Aaron McCurry <[email protected]> Authored: Wed May 27 14:09:02 2015 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed May 27 14:09:02 2015 -0400 ---------------------------------------------------------------------- .../blur/manager/clusterstatus/ZookeeperClusterStatus.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7734b86f/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java index 31b9996..7ae5761 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java +++ b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java @@ -609,7 +609,10 @@ public class ZookeeperClusterStatus extends ClusterStatus { private void assignMapReduceWorkingPath(TableDescriptor tableDescriptor) throws IOException { Map<String, String> tableProperties = tableDescriptor.getTableProperties(); - String mrIncWorkingPathStr = tableProperties.get(BlurConstants.BLUR_BULK_UPDATE_WORKING_PATH); + String mrIncWorkingPathStr = null; + if (tableProperties != null) { + mrIncWorkingPathStr = tableProperties.get(BlurConstants.BLUR_BULK_UPDATE_WORKING_PATH); + } if (mrIncWorkingPathStr == null) { // If not set on the table, try to use cluster default mrIncWorkingPathStr = _configuration.get(BlurConstants.BLUR_BULK_UPDATE_WORKING_PATH);
