You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/12/05 20:52:20 UTC

[1/2] curator git commit: added comment

Repository: curator
Updated Branches:
  refs/heads/CURATOR-443 c49f037ce -> 3f7b610ad


added comment


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

Branch: refs/heads/CURATOR-443
Commit: 0d01ea5587024fa517b79880c9cf5193f3a6522e
Parents: c49f037
Author: randgalt <ra...@apache.org>
Authored: Tue Dec 5 12:45:56 2017 -0800
Committer: randgalt <ra...@apache.org>
Committed: Tue Dec 5 12:45:56 2017 -0800

----------------------------------------------------------------------
 .../org/apache/curator/framework/imps/CuratorFrameworkImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/0d01ea55/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
----------------------------------------------------------------------
diff --git 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
index c91758a..1d3c1b6 100644
--- 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
@@ -646,6 +646,10 @@ public class CuratorFrameworkImpl implements CuratorFramework
         }
     }
 
+    /**
+     * @param operationAndData operation entry
+     * @return true if the operation was actually queued, false if not
+     */
     <DATA_TYPE> boolean queueOperation(OperationAndData<DATA_TYPE> operationAndData)
     {
         if ( getState() == CuratorFrameworkState.STARTED )


[2/2] curator git commit: added comment

Posted by ra...@apache.org.
added comment


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

Branch: refs/heads/CURATOR-443
Commit: 3f7b610ad5c5a0c6a7b0331f02294bd433a54554
Parents: 0d01ea5
Author: randgalt <ra...@apache.org>
Authored: Tue Dec 5 12:47:35 2017 -0800
Committer: randgalt <ra...@apache.org>
Committed: Tue Dec 5 12:47:35 2017 -0800

----------------------------------------------------------------------
 .../org/apache/curator/framework/imps/CuratorFrameworkImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/3f7b610a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
----------------------------------------------------------------------
diff --git 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
index 1d3c1b6..2bd5c7c 100644
--- 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
@@ -1005,7 +1005,7 @@ public class CuratorFrameworkImpl implements CuratorFramework
         for ( OperationAndData<?> operation : drain )
         {
             operation.clearSleep();
-            if ( backgroundOperations.remove(operation) )
+            if ( backgroundOperations.remove(operation) )   // due to the internals of DelayQueue, operation must be removed/re-added so that re-sorting occurs
             {
                 backgroundOperations.offer(operation);
             }