You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/07/10 03:47:26 UTC
[1/2] storm git commit: STORM-3143: Fixed bug of unnecessary
inclusion of empty search result
Repository: storm
Updated Branches:
refs/heads/master 2e3f76735 -> 35d2ed49d
STORM-3143: Fixed bug of unnecessary inclusion of empty search result
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/76a8e62a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/76a8e62a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/76a8e62a
Branch: refs/heads/master
Commit: 76a8e62a019a412f038bae93d74104a9fceefcc2
Parents: db86bad
Author: Zhengdai Hu <zh...@oath.com>
Authored: Thu Jul 5 13:20:43 2018 -0500
Committer: Zhengdai Hu <hu...@gmail.com>
Committed: Thu Jul 5 16:37:16 2018 -0500
----------------------------------------------------------------------
.../storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/76a8e62a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
index 710db6b..8d552e9 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
@@ -426,7 +426,8 @@ public class LogviewerLogSearchHandler {
int newCount = matchCount + ((List<?>)theseMatches.get("matches")).size();
- if (theseMatches.isEmpty()) {
+ //theseMatches is never empty! As guaranteed by the #get().size() method above
+ if (newCount == matchCount) {
// matches and matchCount is not changed
logs = rest(logs);
offset = 0;
[2/2] storm git commit: Merge branch 'STORM-3143' of
https://github.com/zd-project/storm into STORM-3143-merge
Posted by ka...@apache.org.
Merge branch 'STORM-3143' of https://github.com/zd-project/storm into STORM-3143-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/35d2ed49
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/35d2ed49
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/35d2ed49
Branch: refs/heads/master
Commit: 35d2ed49d5b367157b3f1351d23c10fcd57cd017
Parents: 2e3f767 76a8e62
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Jul 10 12:47:15 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Jul 10 12:47:15 2018 +0900
----------------------------------------------------------------------
.../storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------