Repository: storm Updated Branches: refs/heads/master 61a944fd1 -> 3cf71d2c6
[STORM-2829] fix logviewer deepSearch direct self-reference leading to cycle exception Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/860fe46b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/860fe46b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/860fe46b Branch: refs/heads/master Commit: 860fe46b96a078767f667560217a582962a3f3cd Parents: 61a944f Author: Ethan Li <[email protected]> Authored: Tue Nov 21 15:42:55 2017 -0600 Committer: Ethan Li <[email protected]> Committed: Tue Nov 21 15:42:55 2017 -0600 ---------------------------------------------------------------------- .../storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/860fe46b/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 24265ac..3ac2252 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 @@ -414,7 +414,7 @@ public class LogviewerLogSearchHandler { } catch (IOException e) { throw new RuntimeException(e); } - currentFileMatch.put("port", truncatePathToLastElements(firstLogAbsPath, 2).getName(0)); + currentFileMatch.put("port", truncatePathToLastElements(firstLogAbsPath, 2).getName(0).toString()); newMatches.add(currentFileMatch); int newCount = matchCount + ((List<?>)theseMatches.get("matches")).size();
