Merge pull request #12072 from b3log/1.4.0-dev

1.4.0 dev

pom.xml

@@ -105,7 +105,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <org.b3log.latke.version>1.4.8</org.b3log.latke.version>
+        <org.b3log.latke.version>1.4.9</org.b3log.latke.version>
 
         <servlet.version>3.1.0</servlet.version>
         <slf4j.version>1.7.5</slf4j.version>

src/main/java/org/b3log/solo/SoloServletListener.java

@@ -60,7 +60,7 @@ import org.json.JSONObject;
  * Solo Servlet listener.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.8.1.13, Jan 5, 2016
+ * @version 1.8.2.13, Jan 7, 2016
  * @since 0.3.1
  */
 public final class SoloServletListener extends AbstractServletListener {
@@ -119,7 +119,7 @@ public final class SoloServletListener extends AbstractServletListener {
         // Upgrade check (https://github.com/b3log/solo/issues/12040)
         final UpgradeService upgradeService = beanManager.getReference(UpgradeService.class);
         upgradeService.upgrade();
-        JdbcRepository.dispose(); // XXX: JDBC connection close
+        JdbcRepository.dispose();
 
         // Set default skin, loads from preference later
         Skins.setDirectoryForTemplateLoading(Option.DefaultPreference.DEFAULT_SKIN_DIR_NAME);
@@ -163,9 +163,9 @@ public final class SoloServletListener extends AbstractServletListener {
     public void sessionCreated(final HttpSessionEvent httpSessionEvent) {
     }
 
-    // Note: This method will never invoked on GAE production environment
     @Override
     public void sessionDestroyed(final HttpSessionEvent httpSessionEvent) {
+        super.sessionDestroyed(httpSessionEvent);
     }
 
     @Override

src/main/java/org/b3log/solo/event/comment/ArticleCommentReplyNotifier.java

@@ -28,7 +28,6 @@ import org.b3log.latke.mail.MailService;
 import org.b3log.latke.mail.MailService.Message;
 import org.b3log.latke.mail.MailServiceFactory;
 import org.b3log.latke.util.Strings;
-import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.Article;
 import org.b3log.solo.model.Comment;

src/main/java/org/b3log/solo/event/comment/PageCommentReplyNotifier.java

@@ -29,7 +29,6 @@ import org.b3log.latke.mail.MailService;
 import org.b3log.latke.mail.MailService.Message;
 import org.b3log.latke.mail.MailServiceFactory;
 import org.b3log.latke.util.Strings;
-import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.Comment;
 import org.b3log.solo.model.Option;

src/main/java/org/b3log/solo/processor/IndexProcessor.java

@@ -40,7 +40,6 @@ import org.b3log.latke.servlet.renderer.freemarker.AbstractFreeMarkerRenderer;
 import org.b3log.latke.servlet.renderer.freemarker.FreeMarkerRenderer;
 import org.b3log.latke.util.Locales;
 import org.b3log.latke.util.Requests;
-import org.b3log.latke.util.Strings;
 import org.b3log.latke.util.freemarker.Templates;
 import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.model.Common;

src/main/java/org/b3log/solo/service/CommentMgmtService.java

@@ -37,7 +37,6 @@ import org.b3log.latke.service.annotation.Service;
 import org.b3log.latke.urlfetch.*;
 import org.b3log.latke.util.Ids;
 import org.b3log.latke.util.Strings;
-import org.b3log.solo.SoloServletListener;
 import org.b3log.solo.event.EventTypes;
 import org.b3log.solo.model.*;
 import org.b3log.solo.repository.ArticleRepository;