Shinsuke Sugaya hace 11 años
padre
commit
a859ea7f16

+ 4 - 4
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;
     }

+ 1 - 0
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=

+ 1 - 0
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=

+ 5 - 0
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}">