Commit 84654d51 authored by Liang Ding's avatar Liang Ding

在 Latke 框架内回收可能泄露的 DB 连接

parent 023fc9c4
<?xml version="1.0" encoding="UTF-8"?>
<!--
Description: Solo POM.
Version: 3.18.3.31, Oct 27, 2018
Version: 3.18.3.32, Oct 31, 2018
Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a>
Author: <a href="http://vanessa.b3log.org">Vanessa</a>
......@@ -75,7 +75,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.b3log.latke.version>2.4.23</org.b3log.latke.version>
<org.b3log.latke.version>2.4.25</org.b3log.latke.version>
<servlet.version>3.1.0</servlet.version>
<slf4j.version>1.7.5</slf4j.version>
......
......@@ -29,7 +29,6 @@ import org.b3log.latke.logging.Logger;
import org.b3log.latke.plugin.PluginManager;
import org.b3log.latke.plugin.ViewLoadEventHandler;
import org.b3log.latke.repository.Transaction;
import org.b3log.latke.repository.jdbc.JdbcRepository;
import org.b3log.latke.servlet.AbstractServletListener;
import org.b3log.latke.util.Requests;
import org.b3log.latke.util.Stopwatchs;
......@@ -52,7 +51,7 @@ import javax.servlet.http.HttpSessionEvent;
* Solo Servlet listener.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.10.0.1, Oct 24, 2018
* @version 1.10.0.2, Oct 31, 2018
* @since 0.3.1
*/
public final class SoloServletListener extends AbstractServletListener {
......@@ -91,8 +90,6 @@ public final class SoloServletListener extends AbstractServletListener {
final ImportService importService = beanManager.getReference(ImportService.class);
importService.importMarkdowns();
JdbcRepository.dispose();
final OptionRepository optionRepository = beanManager.getReference(OptionRepository.class);
final Transaction transaction = optionRepository.beginTransaction();
try {
......
......@@ -28,7 +28,6 @@ import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.model.Role;
import org.b3log.latke.model.User;
import org.b3log.latke.repository.jdbc.JdbcRepository;
import org.b3log.latke.servlet.HTTPRequestMethod;
import org.b3log.latke.servlet.annotation.RequestProcessing;
import org.b3log.latke.servlet.annotation.RequestProcessor;
......@@ -56,7 +55,7 @@ import java.util.concurrent.ConcurrentHashMap;
* </ul>
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.0, Sep 21, 2018
* @version 1.0.0.1, Oct 31, 2018
* @since 2.9.5
*/
@RequestProcessor
......@@ -204,7 +203,6 @@ public class OAuthGitHubProcessor {
addUserReq.put(UserExt.USER_AVATAR, userAvatar);
addUserReq.put(User.USER_ROLE, Role.VISITOR_ROLE);
userMgmtService.addUser(addUserReq);
JdbcRepository.dispose();
}
}
......
......@@ -24,7 +24,6 @@ import org.b3log.latke.Keys;
import org.b3log.latke.ioc.Inject;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.latke.repository.jdbc.JdbcRepository;
import org.b3log.latke.service.annotation.Service;
import org.b3log.latke.util.Strings;
import org.b3log.solo.SoloServletListener;
......@@ -40,7 +39,7 @@ import java.util.*;
* Import service.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.2, Sep 16, 2018
* @version 1.0.1.3, Oct 31, 2018
* @since 2.2.0
*/
@Service
......@@ -74,7 +73,6 @@ public class ImportService {
*/
public void importMarkdowns() {
new Thread(() -> {
try {
final ServletContext servletContext = SoloServletListener.getServletContext();
final String markdownsPath = servletContext.getRealPath("markdowns");
LOGGER.debug("Import directory [" + markdownsPath + "]");
......@@ -141,9 +139,6 @@ public class ImportService {
logBuilder.append(" :p");
}
LOGGER.info(logBuilder.toString());
} finally {
JdbcRepository.dispose();
}
}).start();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment