Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
1d1b29bb
Commit
1d1b29bb
authored
Jun 09, 2017
by
Guus der Kinderen
Committed by
akrherz
Jun 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OF-1338: Ignore release status when comparing minimum server version requirement. (#814)
parent
c790501a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
PluginManager.java
...va/org/jivesoftware/openfire/container/PluginManager.java
+4
-1
No files found.
src/java/org/jivesoftware/openfire/container/PluginManager.java
View file @
1d1b29bb
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment