From: Sébastien Lesaint Date: Tue, 28 Jun 2016 10:45:10 +0000 (+0200) Subject: Fix PopulateUuidPathColumnOnProjects for Oracle X-Git-Tag: 6.0-RC1~244 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=90b5fc9eac6cf5f5674697a8301945030cf46e7c;p=sonarqube.git Fix PopulateUuidPathColumnOnProjects for Oracle --- diff --git a/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateUuidPathColumnOnProjects.java b/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateUuidPathColumnOnProjects.java index ce12eb26bc5..71e7aa77a76 100644 --- a/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateUuidPathColumnOnProjects.java +++ b/sonar-db/src/main/java/org/sonar/db/version/v60/PopulateUuidPathColumnOnProjects.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nullable; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.db.Database; @@ -134,6 +135,7 @@ public class PopulateUuidPathColumnOnProjects extends BaseDataChange { } private static final class Snapshot { + private static final long[] EMPTY_PATH = new long[0]; private final long id; private final long[] snapshotPath; private final String componentUuid; @@ -144,8 +146,11 @@ public class PopulateUuidPathColumnOnProjects extends BaseDataChange { this.componentUuid = componentUuid; } - // inputs: "", "1." or "1.2.3." - private long[] parsePath(String snapshotPath) { + // inputs: null (on Oracle), "", "1." or "1.2.3." + private long[] parsePath(@Nullable String snapshotPath) { + if (snapshotPath == null) { + return EMPTY_PATH; + } return PATH_SPLITTER .splitToList(snapshotPath) .stream()