You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2021/01/21 23:33:01 UTC
[lucene-solr] branch branch_8x updated: SOLR-15097: Supply base_url
in replica data returned to Admin UI (#2232)
This is an automated email from the ASF dual-hosted git repository.
thelabdude pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 36758f4 SOLR-15097: Supply base_url in replica data returned to Admin UI (#2232)
36758f4 is described below
commit 36758f4395e9613b8fc41d03f91e895d7c9f9f08
Author: Timothy Potter <th...@gmail.com>
AuthorDate: Thu Jan 21 16:32:42 2021 -0700
SOLR-15097: Supply base_url in replica data returned to Admin UI (#2232)
---
.../java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
index 5d18b36..d6afc61 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
@@ -674,10 +674,10 @@ public final class ZookeeperInfoHandler extends RequestHandlerBase {
// verify this collection matches the status filter
if (page.matchesStatusFilter((Map<String, Object>) collectionState, liveNodes)) {
matchesStatusFilter.add(collection);
- collectionStates.put(collection, collectionState);
+ collectionStates.put(collection, ClusterStatus.postProcessCollectionJSON((Map<String, Object>) collectionState));
}
} else {
- collectionStates.put(collection, collectionState);
+ collectionStates.put(collection, ClusterStatus.postProcessCollectionJSON((Map<String, Object>) collectionState));
}
} else {
// looks like an external collection ...
@@ -702,10 +702,10 @@ public final class ZookeeperInfoHandler extends RequestHandlerBase {
// verify this collection matches the filtered state
if (page.matchesStatusFilter((Map<String, Object>) collectionState, liveNodes)) {
matchesStatusFilter.add(collection);
- collectionStates.put(collection, collectionState);
+ collectionStates.put(collection, ClusterStatus.postProcessCollectionJSON((Map<String, Object>) collectionState));
}
} else {
- collectionStates.put(collection, collectionState);
+ collectionStates.put(collection, ClusterStatus.postProcessCollectionJSON((Map<String, Object>) collectionState));
}
}
}