Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8176818C19 for ; Mon, 7 Dec 2015 10:54:50 +0000 (UTC) Received: (qmail 58324 invoked by uid 500); 7 Dec 2015 10:54:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 58176 invoked by uid 500); 7 Dec 2015 10:54:44 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 57128 invoked by uid 99); 7 Dec 2015 10:54:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2015 10:54:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BE5A0E052E; Mon, 7 Dec 2015 10:54:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 07 Dec 2015 10:55:21 -0000 Message-Id: <109526c6097247c2a1dad519e35fc4db@git.apache.org> In-Reply-To: <66c7f29592f84789a5ea48b35f7493bc@git.apache.org> References: <66c7f29592f84789a5ea48b35f7493bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [40/50] [abbrv] ignite git commit: IGNITE-2019 Fixed schema import on Mac OSX El Capitan. - Fixes #292. IGNITE-2019 Fixed schema import on Mac OSX El Capitan. - Fixes #292. Signed-off-by: Andrey Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11d668b2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11d668b2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11d668b2 Branch: refs/heads/master Commit: 11d668b2f77b12e7dc9bbc8ebdbfeb5e2ddad716 Parents: e6f6f40 Author: Andrey Authored: Fri Dec 4 15:52:14 2015 +0700 Committer: Andrey Committed: Fri Dec 4 15:52:14 2015 +0700 ---------------------------------------------------------------------- .../org/apache/ignite/schema/ui/SchemaImportApp.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/11d668b2/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java ---------------------------------------------------------------------- diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java index 495c316..6f9e05b 100644 --- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java +++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.reflect.Field; import java.net.URL; import java.net.URLClassLoader; import java.sql.Connection; @@ -1738,6 +1739,19 @@ public class SchemaImportApp extends Application { catch (Exception ignore) { // No-op. } + + // Workaround for JDK 7/JavaFX 2 application on Mac OSX El Capitan. + try { + Class fontFinderCls = Class.forName("com.sun.t2k.MacFontFinder"); + + Field psNameToPathMap = fontFinderCls.getDeclaredField("psNameToPathMap"); + + psNameToPathMap.setAccessible(true); + psNameToPathMap.set(null, new HashMap()); + } + catch (Exception ignore) { + // No-op. + } } launch(args);