[rhq-project/rhq] b95683: Bug 1146611 - Cannot discover EAP6.0.1: supportsMa...
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: b95683ae6366745f53923c8d8d4c2d88cf21e17c
https://github.com/rhq-project/rhq/commit/b95683ae6366745f53923c8d8d4c2d8...
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/util/OSGiVersion.java
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
Bug 1146611 - Cannot discover EAP6.0.1: supportsMatching method fails with
IllegalArgumentException
EAP 6.1.0 version.txt file content is: "JBoss Enterprise Application Platform -
Version 6.0.1 GA"
As a consequence, the version detected will be "6.0.1 GA" (notice the space
instead of a dot)
Give such version strings a chance to make a valid OSGiVersion instance (avoid
IllegalArgumentException)
If the version is still not matching the expected pattern, then supportsPatching default
to false
Also:
* some perf improvements:
** use already compiled PATTERN instead of recompiling on each call of String#split or
String.replaceAll
** use some OSGiVersion constants to avoid parsing over and over again
* some code cleanup (no longer use deprecated methods, remove unused param in private
method, unchecked warning)