Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZOOKEEPER-4325: Fix bug when list "/" with ZkUtil::listSubTreeBFS #1719

Closed
wants to merge 12 commits into from
Closed

ZOOKEEPER-4325: Fix bug when list "/" with ZkUtil::listSubTreeBFS #1719

wants to merge 12 commits into from

Conversation

autumind
Copy link

@autumind autumind commented Jun 26, 2021

Fix bug ZOOKEEPER-4325

@maoling
Copy link
Member

maoling commented Jul 6, 2021

@autumind
You really have an empty line at the end of the file: ZKUtil.java. After you revert it, I will merge it asap at this weekend(07-11).

git  diff 70f70d821c2

@@ -290,4 +291,4 @@ public static String aclToString(List<ACL> acls) {
         }
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/ZKUtilTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/ZKUtilTest.java
index 1111c2a23..3ad1ed94f 100644

@autumind
Copy link
Author

autumind commented Jul 7, 2021

@autumind
You really have an empty line at the end of the file: ZKUtil.java. After you revert it, I will merge it asap at this weekend(07-11).

git  diff 70f70d821c2

@@ -290,4 +291,4 @@ public static String aclToString(List<ACL> acls) {
         }
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/ZKUtilTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/ZKUtilTest.java
index 1111c2a23..3ad1ed94f 100644

What a silly mistake, I've reverted it.

@maoling
Copy link
Member

maoling commented Jul 11, 2021

@autumind You had reverted the empty line at the end of the file: ZKUtil.java ???

@autumind
Copy link
Author

autumind commented Jul 12, 2021

@autumind You had reverted the empty line at the end of the file: ZKUtil.java ???

Actually, I removed the empty line, but I have no idea why this commit
Remove empty line at the end of the file
has no diffs in github view. Besides, ZKUtil.java comes one more line cause I added a line of comment in my patch.

@maoling
Copy link
Member

maoling commented Jul 12, 2021

@autumind

  • What IDE do you use? It must be not the problem of Github.
  • vim doesn't work, please use other tool like sublime, IDEA, or VS code
  • Important things are to be repeated for 3 times:
    use git diff (git diff 70f70d8) to observe the changes before you submit.
    use git diff (git diff 70f70d8) to observe the changes before you submit.
    use git diff (git diff 70f70d8) to observe the changes before you submit.

@autumind autumind closed this Jul 12, 2021
asfgit pushed a commit that referenced this pull request Jul 18, 2021
Fix bug [ZOOKEEPER-4325](https://issues.apache.org/jira/browse/ZOOKEEPER-4325), re-create PR from [#1719](#1719)

Author: autumind <shen.zhibing@mobcb.com>

Reviewers: maoling <maoling@apache.org>

Closes #1729 from autumind/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants