ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-21 08:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/github_dev' into github_dev

Browse source
This commit is contained in:
fanqq 2016-03-08 11:42:49 +08:00
parent 7de084eead 1d4340e63b
commit 425e729942
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/com/ctrip/zeus/service/model/handler/impl/AbstractMultiRelMaintainer.java
View file

@ -98,26 +98,23 @@ public abstract class AbstractMultiRelMaintainer<T, W, X> implements MultiRelMai
List<T> add = new ArrayList<>();
for (int i = 0; i < objects.length; i++) {
List<W> rels;
X object = objects[i];
List<W> rels = getRelations(object);
Integer[] versions = versionRef.get(i);
if (versions[OFFSET_OFFLINE].intValue() == versions[OFFSET_ONLINE].intValue()) {
for (W w : rels) {
T d = clazzT.newInstance();
setDo(object, w, d);
if (getIdxKey(d).getVersion() != 0) add.add(d);
}
continue;
rels = new ArrayList<>();
} else {
rels = getRelations(object);
}
int onlineVersion = versions[OFFSET_ONLINE];
List<T> online = new ArrayList<>();
int retainedVersion = versions[OFFSET_OFFLINE];
List<T> discard = new ArrayList<>();
for (T t : dosRef[i]) {
if (getIdxKey(t).getVersion() == onlineVersion) {
online.add(t);
if (getIdxKey(t).getVersion() != retainedVersion) {
discard.add(t);
}
}
for (Map.Entry<String, List<T>> e : groupByAction(object, rels, online, clazzT).entrySet()) {
for (Map.Entry<String, List<T>> e : groupByAction(object, rels, discard, clazzT).entrySet()) {
List<T> v = actionMap.get(e.getKey());
if (v == null) {
actionMap.put(e.getKey(), e.getValue());