Commit 947b1df7 authored by mainlove's avatar mainlove

Merge branch '0.5.6' of https://github.com/b3log/b3log-solo.git into 0.5.6

parents 1134f4d2 51952abd
......@@ -351,6 +351,8 @@ public final class ArticleMgmtService {
transaction.rollback();
}
LOGGER.log(Level.SEVERE, "Updates an article failed", e);
throw e;
} catch (final Exception e) {
if (transaction.isActive()) {
......
......@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# it is unnecessary to care this file if B3log Solo runs on Google App Engine.
# Version: 1.0.2.1, Sep 19, 2012
# Version: 1.0.2.2, Jan 23, 2013
# Author: Liang Ding
#
......@@ -44,3 +44,7 @@ jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix
jdbc.tablePrefix=b3_solo
#### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
\ No newline at end of file
......@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# it is unnecessary to care this file if B3log Solo runs on Google App Engine.
# Version: 1.0.2.2, Dec 27, 2012
# Version: 1.0.2.3, Jan 23, 2013
# Author: Liang Ding
#
......@@ -43,3 +43,7 @@ jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix
jdbc.tablePrefix=b3_solo
#### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
\ No newline at end of file
......@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# it is unnecessary to care this file if B3log Solo runs on Google App Engine.
# Version: 1.0.2.1, Sep 19, 2012
# Version: 1.0.2.2, Jan 23, 2013
# Author: Liang Ding
#
......@@ -45,3 +45,7 @@ jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix
jdbc.tablePrefix=
#### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt=128
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