Commit c0e46974 authored by Liang Ding's avatar Liang Ding

升级到 latke 1.0.6

默认事务隔离:REPEATABLE_READ;默认数据库连接池:druid
parent cbee7328
......@@ -68,7 +68,7 @@ import org.json.JSONObject;
* Filler utilities.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.6.9, Oct 29, 2013
* @version 1.0.6.10, Feb 11, 2014
* @since 0.3.1
*/
@Service
......@@ -368,18 +368,19 @@ public class Filler {
archiveDates2.add(archiveDates.get(0));
// XXX: Workaround, remove the duplicated archive dates
for (final JSONObject archiveDate : archiveDates) {
final long time = archiveDate.getLong(ArchiveDate.ARCHIVE_TIME);
final String dateString = DateFormatUtils.format(time, "yyyy/MM");
if (1 < archiveDates.size()) { // XXX: Workaround, remove the duplicated archive dates
for (final JSONObject archiveDate : archiveDates) {
final long time = archiveDate.getLong(ArchiveDate.ARCHIVE_TIME);
final String dateString = DateFormatUtils.format(time, "yyyy/MM");
final JSONObject last = archiveDates2.get(archiveDates2.size() - 1);
final String lastDateString = DateFormatUtils.format(last.getLong(ArchiveDate.ARCHIVE_TIME), "yyyy/MM");
final JSONObject last = archiveDates2.get(archiveDates2.size() - 1);
final String lastDateString = DateFormatUtils.format(last.getLong(ArchiveDate.ARCHIVE_TIME), "yyyy/MM");
if (!dateString.equals(lastDateString)) {
archiveDates2.add(archiveDate);
} else {
LOGGER.log(Level.WARN, "Found a duplicated archive date [{0}]", dateString);
if (!dateString.equals(lastDateString)) {
archiveDates2.add(archiveDate);
} else {
LOGGER.log(Level.WARN, "Found a duplicated archive date [{0}]", dateString);
}
}
}
......
......@@ -29,7 +29,7 @@
<properties>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.5</slf4j.version>
<org.b3log.latke.version>1.0.5</org.b3log.latke.version>
<org.b3log.latke.version>1.0.6</org.b3log.latke.version>
<maven-gae-plugin.version>0.9.0</maven-gae-plugin.version>
<gae.version>1.8.1.1</gae.version>
......
......@@ -39,7 +39,7 @@ jdbc.minConnCnt=3
jdbc.maxConnCnt=10
# Be care to change the transaction isolation
jdbc.transactionIsolation=READ_COMMITTED
jdbc.transactionIsolation=REPEATABLE_READ
# The specific table name prefix
jdbc.tablePrefix=b3_solo
......
......@@ -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.4, Apr 1, 2013
# Version: 1.0.2.5, Feb 11, 2014
# Author: Liang Ding
#
......@@ -33,14 +33,15 @@ jdbc.password=
# database connection pool
#jdbc.pool=BoneCP
jdbc.pool=c3p0
#jdbc.pool=c3p0
jdbc.pool=druid
# The minConnCnt MUST larger or equal to 3
jdbc.minConnCnt=3
jdbc.maxConnCnt=10
# Be care to change the transaction isolation
jdbc.transactionIsolation=READ_COMMITTED
jdbc.transactionIsolation=REPEATABLE_READ
# The specific table name prefix
jdbc.tablePrefix=b3_solo
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