From 7f051fd30348a0eef483c1ed9458d0fb7a8253e4 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Thu, 20 Jul 2023 21:40:41 +0200 Subject: [PATCH] OF-2592: autosetup: Do not force default DB when authprovider is default (#2222) When autosetup is running, existing code forced the database connection provider to be the default, when the authprovider was the default. I'm not seeing why this is needed. The result of this is that after running auto-setup (with a default auth provider config), all starts of Openfire except for the first one are likely to fail, when the original setup used something else than the default database provider (eg: the embedded provider). --- .../src/main/java/org/jivesoftware/openfire/XMPPServer.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java index 7e7f6dac23..31adaf1f56 100644 --- a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java +++ b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java @@ -490,9 +490,6 @@ void runAutoSetup() { // steps from setup-profile-settings.jsp if ("default".equals(JiveGlobals.getXMLProperty("autosetup.authprovider.mode", "default"))) { - JiveGlobals.setXMLProperty("connectionProvider.className", - "org.jivesoftware.database.DefaultConnectionProvider"); - JiveGlobals.setProperty(AuthFactory.AUTH_PROVIDER.getKey(), JiveGlobals.getXMLProperty(AuthFactory.AUTH_PROVIDER.getKey(), AuthFactory.AUTH_PROVIDER.getDefaultValue().getName())); JiveGlobals.setProperty(UserManager.USER_PROVIDER.getKey(), JiveGlobals.getXMLProperty(UserManager.USER_PROVIDER.getKey(),