Merge pull request #63 from boxen/error-handling

java_*version: handle nil output better.
boxen · Aug 13, 2015 · 48b4370 · 48b4370
2 parents 8d209d0 + d2b9993
commit 48b4370
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/facter/java_jre_version.rb b/lib/facter/java_jre_version.rb
@@ -16,6 +16,8 @@
     java_jre = "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
     next unless File.exist? java_jre
     t_java_jre = Facter::Util::Resolution.exec("'#{java_jre}' -version 2>&1")
-    java_jre_version = t_java_jre.to_s.lines.first.strip.split(/version/)[1].gsub(/"/, "").strip
+    next unless t_java_jre_line = t_java_jre.to_s.lines.first
+    next unless t_java_jre_version_section = t_java_jre_line.strip.split(/version/)[1]
+    java_jre_version = t_java_jre_version_section.gsub(/"/, "").strip
   end
 end
diff --git a/lib/facter/java_version.rb b/lib/facter/java_version.rb
@@ -16,6 +16,8 @@
     # This will fail on OS X when Java hasn't been installed yet.
     next unless system "/usr/libexec/java_home --failfast &>/dev/null"
     t_java = Facter::Util::Resolution.exec("java -version 2>&1")
-    java_version = t_java.to_s.lines.first.strip.split(/version/)[1].gsub(/"/, "").strip
+    next unless t_java_line = t_java.to_s.lines.first.to_s
+    next unless t_java_version_section = t_java_line.strip.split(/version/)[1]
+    java_version = t_java_version_section.gsub(/"/, "").strip
   end
 end