From b6fbebe9ea2c5e25321663e85aeceb50da88ffb6 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Thu, 14 Jan 2010 15:23:49 +0000
Subject: [PATCH] [FIXED HUDSON-5272] improved error diagnostics in 1.342.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@25810 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/FilePath.java | 74 +++++++++++++------------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 63054a8ec0..b8483467c1 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -526,49 +526,53 @@ public final class FilePath implements Serializable {
      * @since 1.299
      */
     public boolean installIfNecessaryFrom(URL archive, TaskListener listener, String message) throws IOException, InterruptedException {
-        URLConnection con;
         try {
-            con = archive.openConnection();
-            con.connect();
-        } catch (IOException x) {
-            if (this.exists()) {
-                // Cannot connect now, so assume whatever was last unpacked is still OK.
-                if (listener != null) {
-                    listener.getLogger().println("Skipping installation of " + archive + " to " + remote + ": " + x);
+            URLConnection con;
+            try {
+                con = archive.openConnection();
+                con.connect();
+            } catch (IOException x) {
+                if (this.exists()) {
+                    // Cannot connect now, so assume whatever was last unpacked is still OK.
+                    if (listener != null) {
+                        listener.getLogger().println("Skipping installation of " + archive + " to " + remote + ": " + x);
+                    }
+                    return false;
+                } else {
+                    throw x;
                 }
-                return false;
-            } else {
-                throw x;
             }
-        }
-        long sourceTimestamp = con.getLastModified();
-        FilePath timestamp = this.child(".timestamp");
+            long sourceTimestamp = con.getLastModified();
+            FilePath timestamp = this.child(".timestamp");
 
-        if(this.exists()) {
-            if(timestamp.exists() && sourceTimestamp ==timestamp.lastModified())
-                return false;   // already up to date
-            this.deleteContents();
-        } else {
-            this.mkdirs();
-        }
+            if(this.exists()) {
+                if(timestamp.exists() && sourceTimestamp ==timestamp.lastModified())
+                    return false;   // already up to date
+                this.deleteContents();
+            } else {
+                this.mkdirs();
+            }
 
-        if(listener!=null)
-            listener.getLogger().println(message);
+            if(listener!=null)
+                listener.getLogger().println(message);
 
-        // for HTTP downloads, enable automatic retry for added resilience
-        InputStream in = archive.getProtocol().equals("http") ? new RetryableHttpStream(archive) : con.getInputStream();
-        CountingInputStream cis = new CountingInputStream(in);
-        try {
-            if(archive.toExternalForm().endsWith(".zip"))
-                unzipFrom(cis);
-        else
-            untarFrom(cis,GZIP);
+            // for HTTP downloads, enable automatic retry for added resilience
+            InputStream in = archive.getProtocol().equals("http") ? new RetryableHttpStream(archive) : con.getInputStream();
+            CountingInputStream cis = new CountingInputStream(in);
+            try {
+                if(archive.toExternalForm().endsWith(".zip"))
+                    unzipFrom(cis);
+            else
+                untarFrom(cis,GZIP);
+            } catch (IOException e) {
+                throw new IOException2(String.format("Failed to unpack %s (%d bytes read of total %d)",
+                        archive,cis.getByteCount(),con.getContentLength()),e);
+            }
+            timestamp.touch(sourceTimestamp);
+            return true;
         } catch (IOException e) {
-            throw new IOException2(String.format("Failed to unpack %s (%d bytes read of total %d)",
-                    archive,cis.getByteCount(),con.getContentLength()),e);
+            throw new IOException2("Failed to install "+archive+" to "+remote,e);
         }
-        timestamp.touch(sourceTimestamp);
-        return true;
     }
 
     /**