curator-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dragonsinth <...@git.apache.org>
Subject [GitHub] curator pull request: Major re-work of Watcher wrappers
Date Mon, 08 Feb 2016 17:41:32 GMT
Github user dragonsinth commented on a diff in the pull request:

    https://github.com/apache/curator/pull/131#discussion_r52200119
  
    --- Diff: curator-framework/src/main/java/org/apache/curator/framework/imps/Watching.java
---
    @@ -48,15 +53,30 @@
         {
             watcher = null;
             watched = false;
    +        curatorWatcher = null;
         }
     
         Watcher getWatcher(CuratorFrameworkImpl client, String unfixedPath)
         {
    -        if ( (watcher != null) && (client.getWatcherRemovalManager() != null)
)
    +        NamespaceWatcher namespaceWatcher = null;
    +        if ( watcher != null )
    +        {
    +            namespaceWatcher = new NamespaceWatcher(client, this.watcher, unfixedPath);
    +        }
    +        else if ( curatorWatcher != null )
             {
    -            return client.getWatcherRemovalManager().add(unfixedPath, watcher);
    +            namespaceWatcher = new NamespaceWatcher(client, curatorWatcher, unfixedPath);
             }
    -        return watcher;
    +
    +        if ( namespaceWatcher != null )
    +        {
    +            if ( client.getWatcherRemovalManager() != null )
    +            {
    +                client.getWatcherRemovalManager().add(namespaceWatcher);
    +            }
    +        }
    +
    +        return namespaceWatcher;
         }
     
         boolean isWatched()
    --- End diff --
    
    unrelated to PR, but a name like `needsImplicitWatch` might better explain the purpose


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message