diff --git a/src/main/java/jp/sf/fess/action/admin/DocumentAction.java b/src/main/java/jp/sf/fess/action/admin/DocumentAction.java
index da276ed4870d0def16197d2139dc8ba45770a0b4..3ac28780d4c6007f5135631c2cf8120ed714968a 100644
--- a/src/main/java/jp/sf/fess/action/admin/DocumentAction.java
+++ b/src/main/java/jp/sf/fess/action/admin/DocumentAction.java
@@ -325,17 +325,17 @@ public class DocumentAction implements Serializable {
public List<Map<String, Object>> getGroupActionItems() {
final List<Map<String, Object>> groupActionItems = new ArrayList<Map<String, Object>>();
- try {
- for (final String groupName : solrGroupManager.getSolrGroupNames()) {
+ for (final String groupName : solrGroupManager.getSolrGroupNames()) {
+ try {
final Map<String, Object> map = new HashMap<String, Object>();
map.put("groupName", groupName);
final SessionIdList<Map<String, String>> sessionIdList = getSessionIdList(groupName);
map.put("sessionIdItems", sessionIdList);
map.put("totalCount", sessionIdList.getTotalCount());
groupActionItems.add(map);
+ } catch (final Exception e) {
+ logger.info("could not get server groups.", e);
}
- } catch (final Exception e) {
- logger.info("could not get server groups.", e);
}
return groupActionItems;
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5e66e44b729dd368e6f71bff3938f3191570d478..fe843d26a2d02036b14f93667328a179188bf197 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -743,6 +743,7 @@ labels.system_server_status=Server Status
labels.system_index_status=Index Status
labels.crawler_status_title=Crawler Status
labels.crawler_sessionid_all=All
+labels.no_available_solr_servers=No available Solr server.
# view/admin/crawlingSession/confirm.jsp
#labels.path_mapping_configuration=
diff --git a/src/main/resources/application_ja.properties b/src/main/resources/application_ja.properties
index 5b1f7a0d5e893ba69ed4d72bb0a70bbf87fd6eb0..4d415a806f7c561b963b959ce0572b2eef98b9f6 100644
--- a/src/main/resources/application_ja.properties
+++ b/src/main/resources/application_ja.properties
@@ -741,6 +741,7 @@ labels.system_server_status=\u30b5\u30fc\u30d0\u30fc\u72b6\u614b
labels.system_index_status=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u72b6\u614b
labels.crawler_status_title=\u30af\u30ed\u30fc\u30e9\u30fc\u72b6\u614b
labels.crawler_sessionid_all=\u3059\u3079\u3066
+labels.no_available_solr_servers=\u5229\u7528\u53ef\u80fd\u306aSolr\u30b5\u30fc\u30d0\u304c\u3042\u308a\u307e\u305b\u3093\u3002
# view/admin/crawlingSession/confirm.jsp
#labels.path_mapping_configuration=
diff --git a/src/main/webapp/WEB-INF/view/admin/document/index.jsp b/src/main/webapp/WEB-INF/view/admin/document/index.jsp
index e23c8990e058b98306ad0a0389709acf4326bd6f..6098eb00236ee0005f9c57301bdf1f54b1434c8b 100644
--- a/src/main/webapp/WEB-INF/view/admin/document/index.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/document/index.jsp
@@ -20,6 +20,10 @@
</div>
<%-- Message: END --%>
+<c:if test="${empty groupActionItems}">
+<div class="alert-message error"><bean:message key="labels.no_available_solr_servers" /></div>
+</c:if>
+<c:if test="${!empty groupActionItems}">
<div>
<h3>
<bean:message key="labels.solr_title_action" />
@@ -137,6 +141,7 @@
</tbody>
</table>
</div>
+</c:if>
</div>
<c:if test="${solrProcessRunning}">