[inspector] Handle InaccessibleObjectException for foreign-module fields

clojure-emacs · Dec 30, 2019 · 78e49b5 · 78e49b5
1 parent aec7d68
commit 78e49b5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## master (unreleased)
 
+* [#81](https://github.com/clojure-emacs/orchard/issues/81): [Inspector] Handle InaccessibleObjectException on Java 9+.
+* [#80](https://github.com/clojure-emacs/orchard/issues/80): [Inspector] Render nils in data structures.
+
 ## 0.5.4 (2019-11-05)
 
 ### Bugs fixed

diff --git a/src/orchard/inspect.clj b/src/orchard/inspect.clj
@@ -428,11 +428,19 @@
               (.getName f))
 
             (field-val [^Field f]
-              (try (.setAccessible f true)
-                   (catch java.lang.SecurityException e))
-              (try (.get f obj)
-                   (catch java.lang.IllegalAccessException e
-                     "Access denied.")))
+              (let [e (try (.setAccessible f true)
+                           nil
+                           (catch Exception e
+                             ;; We want to handle specifically SecurityException
+                             ;; and j.l.r.InaccessibleObjectException, but the
+                             ;; latter only comes with Java9+, so let's just
+                             ;; catch everything instead.
+                             e))]
+                (try (.get f obj)
+                     (catch java.lang.IllegalAccessException _
+                       (symbol
+                        (format "<Access denied%s>"
+                                (when e (str " (" (.getName (.getClass e)) ")"))))))))
 
             (render-fields [inspector section-name fields]
               (if (seq fields)