You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2019/10/28 16:13:32 UTC

[netbeans-html4j] branch master updated: Try to load WebKit and JSC first and fail if they aren't available.

This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git


The following commit(s) were added to refs/heads/master by this push:
     new 05cde97  Try to load WebKit and JSC first and fail if they aren't available.
05cde97 is described below

commit 05cde97ff6ec59a3f92814703657d8d30abd357c
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Mon Oct 28 17:11:28 2019 +0100

    Try to load WebKit and JSC first and fail if they aren't available.
---
 .../src/main/java/org/netbeans/html/presenters/render/GTK.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/renderer/src/main/java/org/netbeans/html/presenters/render/GTK.java b/renderer/src/main/java/org/netbeans/html/presenters/render/GTK.java
index 21df106..906f1fc 100644
--- a/renderer/src/main/java/org/netbeans/html/presenters/render/GTK.java
+++ b/renderer/src/main/java/org/netbeans/html/presenters/render/GTK.java
@@ -363,12 +363,17 @@ final class GTK extends Show implements InvokeLater {
 
         Libs() {
             List<Throwable> errors = new ArrayList<Throwable>();
-            this.gtk = Libs.loadLibrary(Gtk.class, false, null);
+            this.webKit = Libs.loadLibrary(WebKit.class, false, errors);
             this.jsc = Libs.loadLibrary(JSC.class, true, errors);
+
+            if (!errors.isEmpty()) {
+                throw linkageError(errors);
+            }
+
+            this.gtk = Libs.loadLibrary(Gtk.class, false, null);
             this.g = Libs.loadLibrary(G.class, false, errors);
             this.glib = Libs.loadLibrary(GLib.class, false, errors);
             this.gdk = Libs.loadLibrary(Gdk.class, false, errors);
-            this.webKit = Libs.loadLibrary(WebKit.class, false, errors);
 
             if (!errors.isEmpty()) {
                 throw linkageError(errors);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists