accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [37/50] [abbrv] git commit: ACCUMULO-1537 fixed NPE in MAC
Date Wed, 17 Jul 2013 02:33:39 GMT
ACCUMULO-1537 fixed NPE in MAC

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502381 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb2c0c75
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb2c0c75
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb2c0c75

Branch: refs/heads/ACCUMULO-1496
Commit: fb2c0c75141177da429bc9094d6d5b15ba12f05e
Parents: 720e27a
Author: Keith Turner <kturner@apache.org>
Authored: Thu Jul 11 22:04:55 2013 +0000
Committer: Keith Turner <kturner@apache.org>
Committed: Thu Jul 11 22:04:55 2013 +0000

----------------------------------------------------------------------
 .../accumulo/minicluster/MiniAccumuloCluster.java      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb2c0c75/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index 16b1381..c492e1b 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@ -244,11 +244,14 @@ public class MiniAccumuloCluster {
 
     File nativeMap = new File(config.getLibDir().getAbsolutePath() + "/native/map");
     nativeMap.mkdirs();
-    String testRoot = new File(new File(System.getProperty("user.dir")).getParent() + "/server/src/main/c++/nativeMap").getAbsolutePath();
-    for (String file : new File(testRoot).list()) {
-      File src = new File(testRoot, file);
-      if (src.isFile() && file.startsWith("libNativeMap"))
-        FileUtils.copyFile(src, new File(nativeMap, file));
+    File testRoot = new File(new File(new File(System.getProperty("user.dir")).getParent()
+ "/server/src/main/c++/nativeMap").getAbsolutePath());
+    
+    if (testRoot.exists()) {
+      for (String file : testRoot.list()) {
+        File src = new File(testRoot, file);
+        if (src.isFile() && file.startsWith("libNativeMap"))
+          FileUtils.copyFile(src, new File(nativeMap, file));
+      }
     }
   }
 


Mime
View raw message