svn commit: r1496180 - in /accumulo/branches/ACCUMULO-CURATOR: core/src/main/java/org/apache/accumulo/core/client/admin/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/src/test/java/org/apache/accumulo/proxy/ server/src/main/java/org/apac...

[vines]

Author: vines
Date: Mon Jun 24 19:48:16 2013
New Revision: 1496180

URL: http://svn.apache.org/r1496180
Log:
Tests pass


Modified:
    
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
    
accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
    
accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
    
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java

Modified: 
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1496180&r1=1496179&r2=1496180&view=diff
==============================================================================
--- 
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
 (original)
+++ 
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
 Mon Jun 24 19:48:16 2013
@@ -141,7 +141,7 @@ public class InstanceOperationsImpl impl
     String path = ZooUtil.getRoot(instance) + Constants.ZTSERVERS;
     List<String> results = new ArrayList<String>();
     for (ChildData candidate : cache.getChildren(path)) {
-      List<ChildData> children = cache.getChildren(path + "/" + candidate);
+      List<ChildData> children = cache.getChildren(candidate.getPath());
       if (children != null && children.size() > 0) {
         List<ChildData> copy = new ArrayList<ChildData>(children);
         Collections.sort(copy);

Modified: 
accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java?rev=1496180&r1=1496179&r2=1496180&view=diff
==============================================================================
--- 
accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
 (original)
+++ 
accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
 Mon Jun 24 19:48:16 2013
@@ -68,6 +68,7 @@ public class ZooCache {
         cache.getListenable().addListener(listener);
       }
       try {
+        log.debug("Starting cache against " + zPath + (listener!=null? " using 
listener " + listener:""));
         cache.start(StartMode.BUILD_INITIAL_CACHE);
         // I'll do it myself!
         if (listener != null)

Modified: 
accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1496180&r1=1496179&r2=1496180&view=diff
==============================================================================
--- 
accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
 (original)
+++ 
accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
 Mon Jun 24 19:48:16 2013
@@ -1141,6 +1141,6 @@ public class SimpleTest {
   @AfterClass
   public static void tearDownMiniCluster() throws Exception {
     accumulo.stop();
-    folder.delete();
+//    folder.delete();
   }
 }

Modified: 
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java?rev=1496180&r1=1496179&r2=1496180&view=diff
==============================================================================
--- 
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
 (original)
+++ 
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
 Mon Jun 24 19:48:16 2013
@@ -32,6 +32,7 @@ import org.apache.accumulo.fate.zookeepe
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.accumulo.server.zookeeper.ZooCache;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.curator.framework.recipes.cache.ChildData;
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
 
@@ -189,7 +190,10 @@ public final class ZKAuthenticator imple
     PasswordToken pt = (PasswordToken) token;
     byte[] pass;
     String zpath = ZKUserPath + "/" + principal;
-    pass = zooCache.get(zpath).getData();
+    ChildData cd = zooCache.get(zpath);
+    if (cd == null)
+      return false;
+    pass = cd.getData();
     boolean result = ZKSecurityTool.checkPass(pt.getPassword(), pass);
     return result;
   }