Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
openSource
apollo
Commits
dc4d0c37
Commit
dc4d0c37
authored
Nov 22, 2016
by
张乐
Committed by
GitHub
Nov 22, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #453 from nobodyiam/fix-null
fix npe
parents
cf6700e9
8d8e88c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ReleaseHistoryController.java
...llo/adminservice/controller/ReleaseHistoryController.java
+1
-1
ReleaseService.java
...om/ctrip/framework/apollo/biz/service/ReleaseService.java
+2
-1
No files found.
apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseHistoryController.java
View file @
dc4d0c37
...
...
@@ -122,7 +122,7 @@ public class ReleaseHistoryController {
releaseHistories
.
add
(
releaseHistory
);
//rollback
if
(
release
.
isAbandoned
())
{
if
(
release
.
isAbandoned
()
&&
previousRelease
!=
null
)
{
releaseHistory
.
setDataChangeLastModifiedTime
(
release
.
getDataChangeCreatedTime
());
ReleaseHistory
rollBackReleaseHistory
=
assembleReleaseHistory
(
previousRelease
,
ReleaseOperation
.
ROLLBACK
,
release
.
getId
());
...
...
apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java
View file @
dc4d0c37
...
...
@@ -220,11 +220,12 @@ public class ReleaseService {
Map
<
String
,
String
>
parentConfigurations
=
parentLatestRelease
!=
null
?
gson
.
fromJson
(
parentLatestRelease
.
getConfigurations
(),
configurationTypeReference
)
:
new
HashMap
<>();
long
baseReleaseId
=
parentLatestRelease
==
null
?
0
:
parentLatestRelease
.
getId
();
Map
<
String
,
String
>
childNamespaceToPublishConfigs
=
mergeConfiguration
(
parentConfigurations
,
childNamespaceItems
);
Release
release
=
branchRelease
(
parentNamespace
,
childNamespace
,
releaseName
,
releaseComment
,
childNamespaceToPublishConfigs
,
parentLatestRelease
.
getId
()
,
operator
,
childNamespaceToPublishConfigs
,
baseReleaseId
,
operator
,
ReleaseOperation
.
GRAY_RELEASE
);
return
release
;
...
...
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