incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Fixing another NPE.
Date Thu, 25 Jun 2015 16:03:55 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/master 198586909 -> 146214d9c


Fixing another 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/146214d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/146214d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/146214d9

Branch: refs/heads/master
Commit: 146214d9c8d6230a102dddba4455f5c66934260e
Parents: 1985869
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Jun 25 12:03:36 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Jun 25 12:03:36 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/blur/mapreduce/lib/update/Driver.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/146214d9/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/update/Driver.java
----------------------------------------------------------------------
diff --git a/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/update/Driver.java b/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/update/Driver.java
index 7447673..04cd81e 100644
--- a/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/update/Driver.java
+++ b/blur-mapred/src/main/java/org/apache/blur/mapreduce/lib/update/Driver.java
@@ -105,10 +105,8 @@ public class Driver extends Configured implements Tool {
       inprogressPathList = movePathList(fileSystem, inprogressData, srcPathList);
 
       Job job = Job.getInstance(getConf(), "Blur Row Updater for table [" + table + "]");
-
-      waitForOtherSnapshotsToBeRemoved(client, table, MRUPDATE_SNAPSHOT);
-
       client = BlurClient.getClientFromZooKeeperConnectionStr(blurZkConnection);
+      waitForOtherSnapshotsToBeRemoved(client, table, MRUPDATE_SNAPSHOT);
       client.createSnapshot(table, MRUPDATE_SNAPSHOT);
       TableDescriptor descriptor = client.describe(table);
       Path tablePath = new Path(descriptor.getTableUri());


Mime
View raw message