You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/07/12 00:04:55 UTC
svn commit: r1502381 -
/accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
Author: kturner
Date: Thu Jul 11 22:04:55 2013
New Revision: 1502381
URL: http://svn.apache.org/r1502381
Log:
ACCUMULO-1537 fixed NPE in MAC
Modified:
accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
Modified: accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java?rev=1502381&r1=1502380&r2=1502381&view=diff
==============================================================================
--- accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java (original)
+++ accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Thu Jul 11 22:04:55 2013
@@ -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));
+ }
}
}