Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo
Commits
947b1df7
Commit
947b1df7
authored
Jan 23, 2013
by
mainlove
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0.5.6' of
https://github.com/b3log/b3log-solo.git
into 0.5.6
parents
1134f4d2
51952abd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
3 deletions
+17
-3
core/src/main/java/org/b3log/solo/service/ArticleMgmtService.java
.../main/java/org/b3log/solo/service/ArticleMgmtService.java
+2
-0
war/bae/src/main/resources/local.properties
war/bae/src/main/resources/local.properties
+5
-1
war/h2/src/main/resources/local.properties
war/h2/src/main/resources/local.properties
+5
-1
war/mysql/src/main/resources/local.properties
war/mysql/src/main/resources/local.properties
+5
-1
No files found.
core/src/main/java/org/b3log/solo/service/ArticleMgmtService.java
View file @
947b1df7
...
@@ -351,6 +351,8 @@ public final class ArticleMgmtService {
...
@@ -351,6 +351,8 @@ public final class ArticleMgmtService {
transaction
.
rollback
();
transaction
.
rollback
();
}
}
LOGGER
.
log
(
Level
.
SEVERE
,
"Updates an article failed"
,
e
);
throw
e
;
throw
e
;
}
catch
(
final
Exception
e
)
{
}
catch
(
final
Exception
e
)
{
if
(
transaction
.
isActive
())
{
if
(
transaction
.
isActive
())
{
...
...
war/bae/src/main/resources/local.properties
View file @
947b1df7
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# 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.
# 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
# Author: Liang Ding
#
#
...
@@ -44,3 +44,7 @@ jdbc.transactionIsolation=READ_COMMITTED
...
@@ -44,3 +44,7 @@ jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix
# The specific table name prefix
jdbc.tablePrefix
=
b3_solo
jdbc.tablePrefix
=
b3_solo
#### Cache ####
cache.maxPageCnt
=
128
cache.maxDataCnt
=
128
\ No newline at end of file
war/h2/src/main/resources/local.properties
View file @
947b1df7
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# 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.
# 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
# Author: Liang Ding
#
#
...
@@ -43,3 +43,7 @@ jdbc.transactionIsolation=READ_COMMITTED
...
@@ -43,3 +43,7 @@ jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix
# The specific table name prefix
jdbc.tablePrefix
=
b3_solo
jdbc.tablePrefix
=
b3_solo
#### Cache ####
cache.maxPageCnt
=
128
cache.maxDataCnt
=
128
\ No newline at end of file
war/mysql/src/main/resources/local.properties
View file @
947b1df7
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
# Description: B3log Solo local environment configurations. Configures this file
# Description: B3log Solo local environment configurations. Configures this file
# if B3log Solo runs on a standard Servlet container or Baidu App Engine,
# 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.
# 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
# Author: Liang Ding
#
#
...
@@ -45,3 +45,7 @@ jdbc.transactionIsolation=READ_COMMITTED
...
@@ -45,3 +45,7 @@ jdbc.transactionIsolation=READ_COMMITTED
# The specific table name prefix
# The specific table name prefix
jdbc.tablePrefix
=
jdbc.tablePrefix
=
#### Cache ####
cache.maxPageCnt=128
cache.maxDataCnt
=
128
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment