[Fix JENKINS-13569] Don't look for artifacts if there are none.

If "attach archived artifacts" is checked, but the "Archive the artifacts" post-build option is not, attemping to look for artifacts results in a NPE.
jenkinsci · Apr 27, 2012 · c712a3c · c712a3c
1 parent 00f2e55
commit c712a3c
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/main/java/com/myyearbook/hudson/plugins/confluence/ConfluencePublisher.java b/src/main/java/com/myyearbook/hudson/plugins/confluence/ConfluencePublisher.java
@@ -248,6 +248,13 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
 
         boolean result = true;
         ConfluenceSite site = getSite();
+
+        if (site == null) {
+            log(listener, "Not publishing because no Confluence Site could be found. " +
+                    "Check your Confluence configuration in system settings.");
+            return true;
+        }
+
         ConfluenceSession confluence = site.createSession();
         Result buildResult = build.getResult();
 
@@ -399,13 +406,17 @@ private String performEdits(final AbstractBuild<?, ?> build, final BuildListener
      */
     private List<FilePath> findArtifacts(File artifactsDir) {
         ArrayList<FilePath> files = new ArrayList<FilePath>();
-        for (File f : artifactsDir.listFiles()) {
-            if (f.isDirectory()) {
-                files.addAll(findArtifacts(f));
-            } else if (f.isFile()) {
-                files.add(new FilePath(f));
+
+        if (artifactsDir != null) {
+            for (File f : artifactsDir.listFiles()) {
+                if (f.isDirectory()) {
+                    files.addAll(findArtifacts(f));
+                } else if (f.isFile()) {
+                    files.add(new FilePath(f));
+                }
             }
         }
+
         return files;
     }