github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Non Oracle Javas are all detected as 'good'

Browse source 
Fixes #3824
This commit is contained in:
Andrew Cholakian 2015-08-31 08:37:31 -05:00 • committed by Jordan Sissel
parent a23194c34c
commit f2fcc41aee
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ module LogStash::Util::JavaVersion
return nil if version_string.nil?
parsed = parse_java_version(version_string)
return nil unless parsed
if parsed[:major] == 1 && parsed[:minor] == 7 && parsed[:patch] == 0 && parsed[:update] < 51
true

4
spec/util/java_version_spec.rb
View file

@ -27,6 +27,10 @@ describe "LogStash::Util::JavaVersion" do
expect(mod.bad_java_version?("1.8.0-beta")).to be_falsey
end
it "should not mark non-standard javas as bad (IBM JDK)" do
expect(mod.bad_java_version?("pwi3270sr9fp10-20150708_01 (SR9 FP10)")).to be_falsey
end
describe "parsing java versions" do
it "should return nil on a nil version" do
expect(mod.parse_java_version(nil)).to be_nil