From 8645a7916f514e8e01d27593987d016baff7359e Mon Sep 17 00:00:00 2001 From: Panayotis Katsaloulis Date: Sat, 27 Sep 2014 13:22:16 +0300 Subject: [PATCH] Be optimistic with jcocoa library, in case it is already loaded. --- java/src/ca/weblite/objc/RuntimeUtils.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/java/src/ca/weblite/objc/RuntimeUtils.java b/java/src/ca/weblite/objc/RuntimeUtils.java index 37e8bde..f4292a8 100644 --- a/java/src/ca/weblite/objc/RuntimeUtils.java +++ b/java/src/ca/weblite/objc/RuntimeUtils.java @@ -56,12 +56,17 @@ public class RuntimeUtils { public static boolean loaded = false; static { try { - System.loadLibrary("jcocoa"); + init(); // Be optimistic; probably it is already loaded loaded = true; - } catch (UnsatisfiedLinkError err){ - err.printStackTrace(System.err); + } catch (UnsatisfiedLinkError err1) { + try { + System.loadLibrary("jcocoa"); + init(); + loaded = true; + } catch (UnsatisfiedLinkError err2) { + err2.printStackTrace(System.err); + } } - init(); }