Merge branch 'bugfix/MODULES-4368-java_default_home-invalid-fact' into develop

vStone · vStone · commit 0e6608fd151d · 2017-02-01T08:25:28.000+01:00
diff --git a/lib/facter/java_default_home.rb b/lib/facter/java_default_home.rb
@@ -15,7 +15,9 @@
   setcode do
     if Facter::Util::Resolution.which('readlink')
       java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').strip
-      if java_bin =~ %r(/jre/)
+      if java_bin.empty?
+        nil
+      elsif java_bin =~ %r(/jre/)
         java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
       else
         java_default_home = File.dirname(File.dirname(java_bin))
diff --git a/spec/unit/facter/java_default_home_spec.rb b/spec/unit/facter/java_default_home_spec.rb
@@ -29,6 +29,14 @@
         end
       end
     end
+    context 'returns nil when readlink is present but java is not' do
+      it do
+        java_path_output = ""
+        Facter::Util::Resolution.expects(:which).with("readlink").returns(true)
+        Facter::Util::Resolution.expects(:exec).with("readlink -e /usr/bin/java").returns(java_path_output)
+        expect(Facter.value(:java_default_home)).to be_nil
+      end
+    end
 
     context 'returns nil when readlink not present' do
       it do
