Skip to content

The Unified and Autonomous Development Platform

fix: NPE during upgrade from 9.4.7 -> 10.2.0 with custom authenticator (#1775)

Robin Shen61528cbc376e
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index f29ebaec34..175e2b0056 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -6217,8 +6217,10 @@ public class DataMigrator {
Element valueElement = element.element("value");
if (valueElement != null) {
var userSearchBaseElement = valueElement.element("userSearchBase");
- valueElement.addElement("userSearchBases").addElement("string").setText(userSearchBaseElement.getText().trim());
- userSearchBaseElement.detach();
+ if (userSearchBaseElement != null) {
+ valueElement.addElement("userSearchBases").addElement("string").setText(userSearchBaseElement.getText().trim());
+ userSearchBaseElement.detach();
+ }
}
} else if (key.equals("SSO_CONNECTORS")) {
Element valueElement = element.element("value");