github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-23 22:27:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Handle non-hotspot javas in version check

Browse source 
Fixes #3685
This commit is contained in:
Andrew Cholakian 2015-08-03 16:10:44 -05:00 • committed by Jordan Sissel
parent 8fa55f5877
commit 9e88c90b28
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/logstash/util/java_version.rb
View file

@ -30,6 +30,9 @@ module LogStash::Util::JavaVersion
# The regex below parses this all correctly http://rubular.com/r/sInQc3Nc7f
match = version_string.match(/\A(\d+)\.(\d+)\.(\d+)(_(\d+))?(-(.+))?\Z/)
return nil unless match
major, minor, patch, ufull, update, bfull, build = match.captures
{

8
spec/util/java_version_spec.rb
View file

@ -31,6 +31,14 @@ describe "LogStash::Util::JavaVersion" do
expect(mod.parse_java_version(nil)).to be_nil
end
it "should return nil on non-hotspot javas" do
# Not sure this is what is being returned, but it doesn't match the
# regex, which is the point
expect(mod.parse_java_version("JCL - 20140103_01 based on Oracle 7u51-b11
")).to be_nil
end
shared_examples("version parsing") do |desc, string, major, minor, patch, update, build|
context("#{desc} with version #{string}") do
subject(:parsed) { LogStash::Util::JavaVersion.parse_java_version(string) }