0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #69

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-01-27 23:04:55 +09:00
parent 7ea975c859
commit 2395c15c9b
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/jp/sf/fess/action/admin/SystemAction.java
View file

@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
import jp.sf.fess.Constants;
import jp.sf.fess.crud.util.SAStrutsUtil;
@ -46,10 +47,13 @@ import org.codelibs.solr.lib.policy.impl.StatusPolicyImpl;
import org.seasar.framework.util.StringUtil;
import org.seasar.struts.annotation.ActionForm;
import org.seasar.struts.annotation.Execute;
import org.seasar.struts.util.RequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SystemAction implements Serializable {
private static final String STARTING_CRAWL_PROCESS = "startingCrawlProcess";
private static final Logger logger = LoggerFactory
.getLogger(SystemAction.class);
@ -77,8 +81,6 @@ public class SystemAction implements Serializable {
@Resource
protected ScheduledJobService scheduledJobService;
private boolean executed = false;
public String getHelpLink() {
return systemHelper.getHelpLink("system");
}
@ -230,7 +232,8 @@ public class SystemAction implements Serializable {
scheduledJob.start();
}
SAStrutsUtil.addSessionMessage("success.start_crawl_process");
executed = true;
RequestUtil.getRequest().getSession()
.setAttribute(STARTING_CRAWL_PROCESS, Boolean.TRUE);
} else {
SAStrutsUtil
.addSessionMessage("success.failed_to_start_crawl_process");
@ -320,7 +323,15 @@ public class SystemAction implements Serializable {
}
public boolean isCrawlerRunning() {
return executed || jobHelper.isCrawlProcessRunning();
final HttpSession session = RequestUtil.getRequest().getSession(false);
if (session != null) {
final Object obj = session.getAttribute(STARTING_CRAWL_PROCESS);
if (obj != null) {
session.removeAttribute(STARTING_CRAWL_PROCESS);
return true;
}
}
return jobHelper.isCrawlProcessRunning();
}
public String[] getRunningSessionIds() {