From 99e37fc64f2f11515c53093d1923575fa1b73d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20S=C4=99k?= <tomasz.sek.88@gmail.com>
Date: Mon, 28 May 2018 08:30:06 +0200
Subject: [PATCH] Resolve findbugs issues

---
 .../hudson/plugins/audit_trail/AuditTrailFilter.java |  4 +++-
 .../hudson/plugins/audit_trail/AuditTrailPlugin.java | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/hudson/plugins/audit_trail/AuditTrailFilter.java b/src/main/java/hudson/plugins/audit_trail/AuditTrailFilter.java
index b173ca2..713e95a 100644
--- a/src/main/java/hudson/plugins/audit_trail/AuditTrailFilter.java
+++ b/src/main/java/hudson/plugins/audit_trail/AuditTrailFilter.java
@@ -78,7 +78,9 @@ public void doFilter(ServletRequest request, ServletResponse res, FilterChain ch
             if (uri.startsWith("/queue/item/")) try {
                 extra = " (" + Jenkins.getInstance().getQueue().getItem(Integer.parseInt(
                         uri.substring(12, uri.indexOf('/', 13)))).task.getUrl() + ')';
-            } catch (Exception ignore) { }
+            } catch (Exception e) {
+                LOGGER.log(Level.FINEST, "Error occurred during parsing queue item", e);
+            }
 
             if(LOGGER.isLoggable(Level.FINE))
                 LOGGER.log(Level.FINE, "Audit request {0} by user {1}", new Object[]{uri, username});
diff --git a/src/main/java/hudson/plugins/audit_trail/AuditTrailPlugin.java b/src/main/java/hudson/plugins/audit_trail/AuditTrailPlugin.java
index 64160cc..0e39f39 100644
--- a/src/main/java/hudson/plugins/audit_trail/AuditTrailPlugin.java
+++ b/src/main/java/hudson/plugins/audit_trail/AuditTrailPlugin.java
@@ -122,6 +122,7 @@ public void onFinalized(Run run) {
         }
 
     }
+
     public void onFinalized(AbstractBuild build) {
         if (this.started) {
             StringBuilder causeBuilder = new StringBuilder(100);
@@ -136,7 +137,7 @@ public void onFinalized(AbstractBuild build) {
             for (AuditLogger logger : loggers) {
                 String message = build.getFullDisplayName() +
                         " " + causeBuilder.toString() +
-                        " on node " + (build.getBuiltOn() == null ? "#unknown#" : build.getBuiltOn().getDisplayName()) +
+                        " on node " + buildNodeName(build) +
                         " started at " + build.getTimestampString2() +
                         " completed in " + build.getDuration() + "ms" +
                         " completed: " + build.getResult();
@@ -146,6 +147,15 @@ public void onFinalized(AbstractBuild build) {
         }
     }
 
+    private String buildNodeName(AbstractBuild build) {
+        Node node = build.getBuiltOn();
+        if (node != null) {
+            return node.getDisplayName();
+        }
+
+        return "#unknown#";
+    }
+
     /* package */ void onRequest(String uri, String extra, String username) {
         if (this.started) {
             for (AuditLogger logger : loggers) {