Commit 1d1b29bb authored by Guus der Kinderen's avatar Guus der Kinderen Committed by akrherz

OF-1338: Ignore release status when comparing minimum server version requirement. (#814)

parent c790501a
...@@ -286,7 +286,10 @@ public class PluginManager ...@@ -286,7 +286,10 @@ public class PluginManager
{ {
final Version requiredVersion = new Version( minServerVersion.getTextTrim() ); final Version requiredVersion = new Version( minServerVersion.getTextTrim() );
final Version currentVersion = XMPPServer.getInstance().getServerInfo().getVersion(); final Version currentVersion = XMPPServer.getInstance().getServerInfo().getVersion();
if ( requiredVersion.isNewerThan( currentVersion ) )
// OF-1338: Ignore release status when comparing minimum server version requirement.
final Version compareVersion = new Version( currentVersion.getMajor(), currentVersion.getMinor(), currentVersion.getMicro(), null, -1 );
if ( requiredVersion.isNewerThan( compareVersion ) )
{ {
Log.warn( "Ignoring plugin '{}': requires server version {}. Current server version is {}.", pluginName, requiredVersion, currentVersion ); Log.warn( "Ignoring plugin '{}': requires server version {}. Current server version is {}.", pluginName, requiredVersion, currentVersion );
failureToLoadCount.put( pluginName, Integer.MAX_VALUE ); // Don't retry - this cannot be recovered from. failureToLoadCount.put( pluginName, Integer.MAX_VALUE ); // Don't retry - this cannot be recovered from.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment