sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1806758 - /sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
Date Thu, 31 Aug 2017 05:45:13 GMT
Author: desruisseaux
Date: Thu Aug 31 05:45:13 2017
New Revision: 1806758

URL: http://svn.apache.org/viewvc?rev=1806758&view=rev
Log:
If 'unmerged' do not throw an exception, assumes that is solved the metadata merge conflict.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java?rev=1806758&r1=1806757&r2=1806758&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
[UTF-8] Thu Aug 31 05:45:13 2017
@@ -264,6 +264,7 @@ public class Merger {
                     if (!success) {
                         if (dryRun) break;
                         unmerged(target, propertyName, sourceValue, targetValue);
+                        success = true;  // If no exception has been thrown by 'unmerged',
assume the conflict solved.
                     }
                 }
             }



Mime
View raw message