Skip to content

Commit 3004728

Browse files
committed
CLJCLR-183: Fix NullReferenceException that sometimes occurs in printing a stack trace.
1 parent c1fdbd5 commit 3004728

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Clojure/Clojure.Source/clojure/core_print.clj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,12 +515,14 @@
515515
(defmethod print-method clojure.lang.IDeref [o ^System.IO.TextWriter w]
516516
(print-tagged-object o (deref-as-map o) w))
517517

518-
;;; DM:Added
518+
;;; DM:Added
519519
(defn- stack-frame-info [^System.Diagnostics.StackFrame sf]
520520
(if (nil? sf)
521521
nil
522522
(if-let [m (.GetMethod sf)]
523-
[(symbol (.FullName (.DeclaringType m)))
523+
[(symbol (if-let [declaring-type (.DeclaringType m)]
524+
(.FullName (.DeclaringType m))
525+
"<Unknown type>"))
524526
(symbol (.Name m))
525527
(or (.GetFileName sf) "NO_FILE")
526528
(.GetFileLineNumber sf)]

0 commit comments

Comments
 (0)