[2/3] curator git commit: Merge branch 'CURATOR-111' of https://github.com/kambatla/curator into CURATOR-111

2015-01-12 Thread randgalt 
Merge branch 'CURATOR-111' of https://github.com/kambatla/curator into 
CURATOR-111

Conflicts:

curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java

curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java


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

Branch: refs/heads/CURATOR-111
Commit: 58ecd64f0b0b05590f2bcd350d17c173a5c791ab
Parents: 84699d3 71dc640
Author: randgalt randg...@apache.org
Authored: Mon Jan 12 15:55:20 2015 -0500
Committer: randgalt randg...@apache.org
Committed: Mon Jan 12 15:55:20 2015 -0500

--
 .../org/apache/curator/framework/AuthInfo.java  | 51 
 .../framework/CuratorFrameworkFactory.java  | 23 +
 .../framework/imps/CuratorFrameworkImpl.java| 42 ++--
 .../curator/framework/imps/TestFramework.java   | 44 +
 4 files changed, 132 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/58ecd64f/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
--

http://git-wip-us.apache.org/repos/asf/curator/blob/58ecd64f/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
index fc462d4,f7b08a6..c38617d
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
@@@ -60,60 -60,36 +63,39 @@@ import java.util.concurrent.atomic.Atom
  
  public class CuratorFrameworkImpl implements CuratorFramework
  {
 -
 -private final Loggerlog = 
LoggerFactory.getLogger(getClass());
 -private final CuratorZookeeperClient
client;
 -private final ListenerContainerCuratorListener
listeners;
 -private final ListenerContainerUnhandledErrorListener 
unhandledErrorListeners;
 -private final ThreadFactory 
threadFactory;
 -private final BlockingQueueOperationAndData?
backgroundOperations;
 -private final NamespaceImpl 
namespace;
 -private final ConnectionStateManager
connectionStateManager;
 -private final ListAuthInfo
authInfos;
 -private final byte[]
defaultData;
 -private final FailedDeleteManager   
failedDeleteManager;
 -private final CompressionProvider   
compressionProvider;
 -private final ACLProvider   
aclProvider;
 -private final NamespaceFacadeCache  
namespaceFacadeCache;
 -private final NamespaceWatcherMap   
namespaceWatcherMap = new NamespaceWatcherMap(this);
 -
 -private volatile ExecutorService
executorService;
 -private final AtomicBoolean 
logAsErrorConnectionErrors = new AtomicBoolean(false);
 -
 -private static final boolean
LOG_ALL_CONNECTION_ISSUES_AS_ERROR_LEVEL = 
!Boolean.getBoolean(DebugUtils.PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL);
 +private final Logger log = LoggerFactory.getLogger(getClass());
 +private final CuratorZookeeperClient client;
 +private final ListenerContainerCuratorListener listeners;
 +private final ListenerContainerUnhandledErrorListener 
unhandledErrorListeners;
 +private final ThreadFactory threadFactory;
 +private final int maxCloseWaitMs;
 +private final BlockingQueueOperationAndData? backgroundOperations;
 +private final NamespaceImpl namespace;
 +private final ConnectionStateManager connectionStateManager;
- private final AtomicReferenceAuthInfo authInfo = new 
AtomicReferenceAuthInfo();
++private final ListAuthInfo authInfos;
 +private final byte[] defaultData;
 +private final FailedDeleteManager failedDeleteManager;
 +private final CompressionProvider compressionProvider;
 +private final ACLProvider aclProvider;
 +private final

[2/3] curator git commit: Merge branch 'CURATOR-111' of https://github.com/kambatla/curator into CURATOR-111

2015-01-12 Thread randgalt 
Merge branch 'CURATOR-111' of https://github.com/kambatla/curator into 
CURATOR-111

Conflicts:

curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java

curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java


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

Branch: refs/heads/master
Commit: 58ecd64f0b0b05590f2bcd350d17c173a5c791ab
Parents: 84699d3 71dc640
Author: randgalt randg...@apache.org
Authored: Mon Jan 12 15:55:20 2015 -0500
Committer: randgalt randg...@apache.org
Committed: Mon Jan 12 15:55:20 2015 -0500

--
 .../org/apache/curator/framework/AuthInfo.java  | 51 
 .../framework/CuratorFrameworkFactory.java  | 23 +
 .../framework/imps/CuratorFrameworkImpl.java| 42 ++--
 .../curator/framework/imps/TestFramework.java   | 44 +
 4 files changed, 132 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/58ecd64f/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
--

http://git-wip-us.apache.org/repos/asf/curator/blob/58ecd64f/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
--
diff --cc 
curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
index fc462d4,f7b08a6..c38617d
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
@@@ -60,60 -60,36 +63,39 @@@ import java.util.concurrent.atomic.Atom
  
  public class CuratorFrameworkImpl implements CuratorFramework
  {
 -
 -private final Loggerlog = 
LoggerFactory.getLogger(getClass());
 -private final CuratorZookeeperClient
client;
 -private final ListenerContainerCuratorListener
listeners;
 -private final ListenerContainerUnhandledErrorListener 
unhandledErrorListeners;
 -private final ThreadFactory 
threadFactory;
 -private final BlockingQueueOperationAndData?
backgroundOperations;
 -private final NamespaceImpl 
namespace;
 -private final ConnectionStateManager
connectionStateManager;
 -private final ListAuthInfo
authInfos;
 -private final byte[]
defaultData;
 -private final FailedDeleteManager   
failedDeleteManager;
 -private final CompressionProvider   
compressionProvider;
 -private final ACLProvider   
aclProvider;
 -private final NamespaceFacadeCache  
namespaceFacadeCache;
 -private final NamespaceWatcherMap   
namespaceWatcherMap = new NamespaceWatcherMap(this);
 -
 -private volatile ExecutorService
executorService;
 -private final AtomicBoolean 
logAsErrorConnectionErrors = new AtomicBoolean(false);
 -
 -private static final boolean
LOG_ALL_CONNECTION_ISSUES_AS_ERROR_LEVEL = 
!Boolean.getBoolean(DebugUtils.PROPERTY_LOG_ONLY_FIRST_CONNECTION_ISSUE_AS_ERROR_LEVEL);
 +private final Logger log = LoggerFactory.getLogger(getClass());
 +private final CuratorZookeeperClient client;
 +private final ListenerContainerCuratorListener listeners;
 +private final ListenerContainerUnhandledErrorListener 
unhandledErrorListeners;
 +private final ThreadFactory threadFactory;
 +private final int maxCloseWaitMs;
 +private final BlockingQueueOperationAndData? backgroundOperations;
 +private final NamespaceImpl namespace;
 +private final ConnectionStateManager connectionStateManager;
- private final AtomicReferenceAuthInfo authInfo = new 
AtomicReferenceAuthInfo();
++private final ListAuthInfo authInfos;
 +private final byte[] defaultData;
 +private final FailedDeleteManager failedDeleteManager;
 +private final CompressionProvider compressionProvider;
 +private final ACLProvider aclProvider;
 +private final