D-Net
/
dnet-hadoop
13
4
Fork 10
Code Issues 14 Pull Requests 8 Projects 2 Releases 1 Wiki Activity

master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
pull from: master
merge into: D-Net:stable_ids
Conversation 0 Commits 3221 Files Changed 2141 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit db299dd8ab - Show all commits

8
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java
View File

@ -48,13 +48,13 @@ public class OafMapperUtils {
public static Result mergeResults(Result left, Result right) {
final boolean leftFromDeletedAuthority = isFromDelegatedAuthority(left);
final boolean rightFromDeletedAuthority = isFromDelegatedAuthority(right);
final boolean leftFromDelegatedAuthority = isFromDelegatedAuthority(left);
final boolean rightFromDelegatedAuthority = isFromDelegatedAuthority(right);
if (leftFromDeletedAuthority && !rightFromDeletedAuthority) {
if (leftFromDelegatedAuthority && !rightFromDelegatedAuthority) {
return left;
}
if (!leftFromDeletedAuthority && rightFromDeletedAuthority) {
if (!leftFromDelegatedAuthority && rightFromDelegatedAuthority) {
return right;
}