diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-18 16:39:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-18 16:41:22 +0100 |
| commit | 0274246d088469752c9a91120c0b90c2f08c9282 (patch) | |
| tree | 4cf92d3b156ac9632b503da668613d35b128f43b /jvmfwk/plugins | |
| parent | a3ba2c4784d388bcaf20ef6f5b8b357024969a59 (diff) | |
Support OpenJDK "-internal" version suffix
...as e.g. produced by java-1.8.0-openjdk.fc20
(Sorting Rel_INTERNAL < Rel_EA is somewhat arbitrary.)
Change-Id: I25449ec4da63243fc1044aae366f8fa6c5ef1eb5
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 4 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 9e3114304aca..90feb46a0c07 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -206,7 +206,9 @@ SunVersion::PreRelease SunVersion::getPreRelease(const char *szRelease) { if (szRelease == NULL) return Rel_NONE; - if( ! strcmp(szRelease,"ea")) + if( ! strcmp(szRelease,"internal")) + return Rel_INTERNAL; + else if( ! strcmp(szRelease,"ea")) return Rel_EA; else if( ! strcmp(szRelease,"ea1")) return Rel_EA1; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx index b60959c67105..f2bb7265874d 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx @@ -56,6 +56,7 @@ protected: enum PreRelease { Rel_NONE, + Rel_INTERNAL, Rel_EA, Rel_EA1, Rel_EA2, |