The Unified and Autonomous Development Platform
Fix issue #1086 - Upgrade Failed: 7.7.2 -> 7.9.2 - Configuration parsing failed
Robin Shen3fa82efa5dec
diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.javaindex 9413d386df..2e090e876c 100644--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java@@ -106,10 +106,14 @@ public class DefaultServerConfig implements ServerConfig {String tempStr = StringUtils.substringAfter(dbUrl, "//");dbHost = StringUtils.substringBefore(tempStr, ":");tempStr = StringUtils.substringAfter(tempStr, ":");- if (dbUrl.startsWith("sqlserver"))+ if (dbUrl.startsWith("sqlserver")) {dbPort = Integer.parseInt(StringUtils.substringBefore(tempStr, ";"));- else- dbPort = Integer.parseInt(StringUtils.substringBefore(tempStr, "/"));+ } else {+ tempStr = StringUtils.substringBefore(tempStr, "/");+ // Fix issue https://code.onedev.io/onedev/server/~issues/1086+ tempStr = StringUtils.substringBefore(tempStr, ",");+ dbPort = Integer.parseInt(tempStr);+ }}try (Socket socket = new Socket()) {