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

Merge pull request #229 from shatake/shatake_branch

Browse source 
Modified about shutdown error on Java7
This commit is contained in:
Shinsuke Sugaya 2014-11-05 05:17:47 +09:00
commit 604fb8ef6c
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/jp/sf/fess/servlet/H2ConfigServlet.java
View file

@ -23,6 +23,8 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import org.h2.tools.Server;
import org.seasar.framework.util.Disposable;
import org.seasar.framework.util.DisposableUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -84,8 +86,19 @@ public class H2ConfigServlet extends HttpServlet {
@Override
public void destroy() {
if (server != null) {
server.stop();
if (System.getProperty("java.specification.version").equals("1.7")) {
DisposableUtil.add(new Disposable() {
@Override
public void dispose() {
if (server != null) {
server.stop();
}
}
});
} else {
if (server != null) {
server.stop();
}
}
}