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
96c2bcf5
Commit
96c2bcf5
authored
Jun 12, 2016
by
lepdou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
be9385c8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
PortalConfigService.java
.../framework/apollo/portal/service/PortalConfigService.java
+6
-5
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java
View file @
96c2bcf5
...
...
@@ -189,23 +189,24 @@ public class PortalConfigService {
changeSets
.
addCreateItem
(
buildItem
(
namespaceId
,
++
maxLineNum
,
sourceItem
));
}
else
if
(
isModified
(
sourceValue
,
targetItem
.
getValue
(),
sourceComment
,
targetItem
.
getComment
()))
{
//modified items
}
else
if
(
isModified
(
sourceValue
,
targetItem
.
getValue
(),
sourceComment
,
targetItem
.
getComment
()))
{
//modified items
targetItem
.
setValue
(
sourceValue
);
targetItem
.
setComment
(
sourceComment
);
changeSets
.
addUpdateItem
(
targetItem
);
}
}
}
//parse deleted items
List
<
ItemDTO
>
deletedItems
=
new
LinkedList
<>();
Map
<
String
,
ItemDTO
>
sourceItemMap
=
BeanUtils
.
mapByKey
(
"key"
,
sourceItems
);
for
(
ItemDTO
targetItem:
targetItems
)
{
if
(
sourceItemMap
.
get
(
targetItem
.
getKey
())
==
null
)
{
deletedItems
.
add
(
targetI
tem
);
for
(
ItemDTO
item
:
targetItems
)
{
if
(
sourceItemMap
.
get
(
item
.
getKey
())
==
null
)
{
deletedItems
.
add
(
i
tem
);
}
}
changeSets
.
setDeleteItems
(
deletedItems
);
}
return
changeSets
;
}
...
...
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