From b828a6f494cc90e1a135e7442589679993eb2a5c Mon Sep 17 00:00:00 2001
From: Herbert Dürr <hdu@apache.org>
Date: Fri, 26 Apr 2013 08:51:11 +0000
Subject: Related: #i121715# find official JRE>=7 on OSX

(cherry picked from commit a3eded9728647bde4af68b9f3c75a51dc0676fc7)

Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
	jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

Change-Id: I5ec6aa62147f9b3fb3e5142fbc2658c0b54f21b8
---
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index f488b15653db..38279a653ee6 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -95,6 +95,7 @@ char const *g_arCollectDirs[] = {
 char const *g_arSearchPaths[] = {
 #ifdef MACOSX
     "",
+    "Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
     "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
 #else
 #ifndef JVM_ONE_PATH_CHECK
-- 
cgit