svn commit: r1465108 - /accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java

[ecn]

Author: ecn
Date: Fri Apr  5 20:03:14 2013
New Revision: 1465108

URL: http://svn.apache.org/r1465108
Log:
ACCUMULO-1179 make the accumulo instance directory the home by default

Modified:
    
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java?rev=1465108&r1=1465107&r2=1465108&view=diff
==============================================================================
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
 Fri Apr  5 20:03:14 2013
@@ -49,6 +49,8 @@ public class ZooKeeperMain {
       opts.servers = instance.getZooKeepers();
     }
     System.out.println("The accumulo instance id is " + 
instance.getInstanceID());
+    if (!opts.servers.contains("/"))
+      opts.servers += "/accumulo/"+instance.getInstanceID(); 
     org.apache.zookeeper.ZooKeeperMain.main(new String[]{"-server", 
opts.servers, "-timeout", "" + (opts.timeout * 1000)});
   }
 }