diff --git a/core/src/main/java/hudson/Main.java b/core/src/main/java/hudson/Main.java
index a3dc3b00cb..3e34cd1427 100644
--- a/core/src/main/java/hudson/Main.java
+++ b/core/src/main/java/hudson/Main.java
@@ -156,14 +156,8 @@ public class Main {
                 ret = proc.join();
 
                 w.write("</log><result>"+ret+"</result><duration>"+(System.currentTimeMillis()-start)+"</duration></run>");
-            }
-            finally {
-                try {
-                    w.close();
-                }
-                catch (IOException ioe) {
-                    // swallow exception
-                }
+            } finally {
+                IOUtils.closeQuietly(w);
             }
 
             String location = home+"job/"+projectNameEnc+"/postBuildResult";
@@ -183,14 +177,8 @@ public class Main {
                     FileInputStream in = new FileInputStream(tmpFile);
                     try {
                         Util.copyStream(in,con.getOutputStream());
-                    }
-                    finally {
-                        try {
-                            in.close();
-                        }
-                        catch (IOException ioe) {
-                            // swallow exception
-                        }
+                    } finally {
+                        IOUtils.closeQuietly(in);
                     }
 
                     if(con.getResponseCode()!=200) {
diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java
index d36df3c811..639b2106f7 100644
--- a/core/src/main/java/hudson/console/ConsoleNote.java
+++ b/core/src/main/java/hudson/console/ConsoleNote.java
@@ -174,8 +174,7 @@ public abstract class ConsoleNote<T> implements Serializable, Describable<Consol
         ObjectOutputStream oos = new ObjectOutputStream(new GZIPOutputStream(buf));
         try {
             oos.writeObject(this);
-        }
-        finally {
+        } finally {
             oos.close();
         }
 
@@ -186,8 +185,7 @@ public abstract class ConsoleNote<T> implements Serializable, Describable<Consol
             buf2.write(PREAMBLE);
             dos.writeInt(buf.size());
             buf.writeTo(dos);
-        }
-        finally {
+        } finally {
             dos.close();
         }
         buf2.write(POSTAMBLE);
diff --git a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
index 0246c163e4..79a294b088 100644
--- a/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
+++ b/core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
@@ -113,8 +113,7 @@ public class WindowsServiceLifecycle extends Lifecycle {
         FileWriter w = new FileWriter(copyFiles, true);
         try {
             w.write(by.getAbsolutePath()+'>'+getHudsonWar().getAbsolutePath()+'\n');
-        }
-        finally {
+        } finally {
             w.close();
         }
     }
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
index 00e35a44fa..8544042ce4 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -205,14 +205,8 @@ public class FileParameterValue extends ParameterValue {
                     } else {
                         response.serveFile(request, data, lastModified, contentLength, originalFileName);
                     }
-                }
-                finally {
-                    try {
-                        data.close();
-                    }
-                    catch (IOException ioe) {
-                        // swallow exception
-                    }
+                } finally {
+                    IOUtils.closeQuietly(data);
                 }
             }
         }
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index fba3e653a8..19fa980108 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -2051,14 +2051,8 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
 			} finally {
 				IOUtils.closeQuietly(input);
 			}
-		}
-        finally {
-            try {
-                out.close();
-            }
-            catch (IOException ioe) {
-                // swallow exception
-            }
+		} finally {
+            IOUtils.closeQuietly(out);
         }
     }
 
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 77198ca28a..4a0085d193 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -45,6 +45,7 @@ import hudson.util.DaemonThreadFactory;
 import hudson.util.FormValidation;
 import hudson.util.HttpResponses;
 import hudson.util.IOException2;
+import hudson.util.IOUtils;
 import hudson.util.PersistedList;
 import hudson.util.XStream2;
 import jenkins.RestartRequiredException;
@@ -791,24 +792,9 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
                 return tmp;
             } catch (IOException e) {
                 throw new IOException2("Failed to download from "+src,e);
-            }
-            finally {
-                if (in != null) {
-                    try {
-                        in.close();
-                    }
-                    catch (IOException ioe) {
-                        // swallow exception
-                    }
-                }
-                if (out != null) {
-                    try {
-                        out.close();
-                    }
-                    catch (IOException ioe) {
-                        // swallow exception
-                    }
-                }
+            } finally {
+                IOUtils.closeQuietly(in);
+                IOUtils.closeQuietly(out);
             }
         }
 
diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java
index 0ab5e68a66..714be47454 100644
--- a/core/src/main/java/hudson/model/UsageStatistics.java
+++ b/core/src/main/java/hudson/model/UsageStatistics.java
@@ -28,6 +28,7 @@ import hudson.PluginWrapper;
 import hudson.Util;
 import hudson.Extension;
 import hudson.node_monitors.ArchitectureMonitor.DescriptorImpl;
+import hudson.util.IOUtils;
 import hudson.util.Secret;
 import static hudson.util.TimeUnit2.DAYS;
 
@@ -174,14 +175,8 @@ public class UsageStatistics extends PageDecorator {
             OutputStreamWriter w = new OutputStreamWriter(new GZIPOutputStream(new CombinedCipherOutputStream(baos,getKey(),"AES")), "UTF-8");
             try {
                 o.write(w);
-            }
-            finally {
-                try {
-                    w.close();
-                }
-                catch (IOException ioe) {
-                    // swallow exception
-                }
+            } finally {
+                IOUtils.closeQuietly(w);
             }
 
             return new String(Base64.encode(baos.toByteArray()));
diff --git a/core/src/main/java/hudson/scm/SCM.java b/core/src/main/java/hudson/scm/SCM.java
index 79fbf234a6..b3fbd34524 100644
--- a/core/src/main/java/hudson/scm/SCM.java
+++ b/core/src/main/java/hudson/scm/SCM.java
@@ -41,6 +41,7 @@ import hudson.model.Describable;
 import hudson.model.TaskListener;
 import hudson.model.Node;
 import hudson.model.WorkspaceCleanupThread;
+import hudson.util.IOUtils;
 import jenkins.model.Jenkins;
 import hudson.model.Descriptor;
 import hudson.model.Api;
@@ -586,15 +587,8 @@ public abstract class SCM implements Describable<SCM>, ExtensionPoint {
         } catch (IOException e) {
             e.printStackTrace(listener.error(e.getMessage()));
             return false;
-        }
-        finally {
-            if (w != null) {
-                try {
-                    w.close();
-                } catch (IOException e) {
-                    // swallow exception
-                }
-            }
+        } finally {
+            IOUtils.closeQuietly(w);
         }
     }
 
diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java
index 71ace14f35..40abe42ee7 100644
--- a/core/src/main/java/hudson/tools/JDKInstaller.java
+++ b/core/src/main/java/hudson/tools/JDKInstaller.java
@@ -172,14 +172,8 @@ public class JDKInstaller extends ToolInstaller {
                 DataInputStream in = new DataInputStream(fs.read(jdkBundle));
                 try {
                     in.readFully(header);
-                }
-                finally {
-                    try {
-                        in.close();
-                    }
-                    catch (IOException ioe) {
-                        // swallow exception
-                    }
+                } finally {
+                    IOUtils.closeQuietly(in);
                 }
             }
 
diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java
index df8c286e62..0f140bf91b 100644
--- a/core/src/main/java/hudson/triggers/SCMTrigger.java
+++ b/core/src/main/java/hudson/triggers/SCMTrigger.java
@@ -31,6 +31,7 @@ import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.Action;
 import hudson.model.Cause;
+import hudson.util.IOUtils;
 import jenkins.model.Jenkins;
 import hudson.model.Item;
 import hudson.model.Project;
@@ -324,14 +325,8 @@ public class SCMTrigger extends Trigger<SCMedItem> {
             FlushProofOutputStream out = new FlushProofOutputStream(rsp.getCompressedOutputStream(req));
             try {
                 getPollingLogText().writeLogTo(0, out);
-            }
-            finally {
-                try {
-                    out.close();
-                }
-                catch (IOException ioe) {
-                    // swallow exception
-                }
+            } finally {
+                IOUtils.closeQuietly(out);
             }
         }
 
diff --git a/core/src/main/java/hudson/util/CompressedFile.java b/core/src/main/java/hudson/util/CompressedFile.java
index 8938f3276e..f3a9133588 100644
--- a/core/src/main/java/hudson/util/CompressedFile.java
+++ b/core/src/main/java/hudson/util/CompressedFile.java
@@ -120,14 +120,8 @@ public class CompressedFile {
             int len;
             while((len=r.read(buf,0,buf.length))>0)
                 str.append(buf,0,len);
-        }
-        finally {
-            try {
-                r.close();
-            }
-            catch (IOException ioe) {
-                // swallow exception
-            }
+        } finally {
+            IOUtils.closeQuietly(r);
         }
 
         return str.toString();
diff --git a/core/src/main/java/hudson/util/TextFile.java b/core/src/main/java/hudson/util/TextFile.java
index 2d804a7ebe..f010f12e1a 100644
--- a/core/src/main/java/hudson/util/TextFile.java
+++ b/core/src/main/java/hudson/util/TextFile.java
@@ -86,18 +86,7 @@ public class TextFile {
             w.write(text);
             w.commit();
         } finally {
-            try {
-                w.abort();
-            }
-            catch (IOException ioe) {
-                // swallow exception
-            }
-            try {
-                w.close();
-            }
-            catch (IOException ioe) {
-                // swallow exception
-            }
+            w.abort();
         }
     }
 
diff --git a/core/src/main/java/hudson/util/io/ZipArchiver.java b/core/src/main/java/hudson/util/io/ZipArchiver.java
index 2e539ab880..ef0ae49658 100644
--- a/core/src/main/java/hudson/util/io/ZipArchiver.java
+++ b/core/src/main/java/hudson/util/io/ZipArchiver.java
@@ -72,10 +72,9 @@ final class ZipArchiver extends Archiver {
             FileInputStream in = new FileInputStream(f);
             try {
                 int len;
-                while((len=in.read(buf))>0)
+                while((len=in.read(buf))>=0)
                     zip.write(buf,0,len);
-            }
-            finally {
+            } finally {
                 in.close();
             }
             zip.closeEntry();
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 1a16d0b35b..dae24c69df 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -176,6 +176,7 @@ import hudson.util.FormValidation;
 import hudson.util.Futures;
 import hudson.util.HudsonIsLoading;
 import hudson.util.HudsonIsRestarting;
+import hudson.util.IOUtils;
 import hudson.util.Iterators;
 import hudson.util.JenkinsReloadFailed;
 import hudson.util.Memoizer;
@@ -3928,16 +3929,8 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
                 props.load(is);
         } catch (IOException e) {
             e.printStackTrace(); // if the version properties is missing, that's OK.
-        }
-        finally {
-            if (is != null) {
-                try {
-                    is.close();
-                }
-                catch (IOException ioe) {
-                    // swallow exception
-                }
-            }
+        } finally {
+            IOUtils.closeQuietly(is);
         }
         String ver = props.getProperty("version");
         if(ver==null)   ver="?";
diff --git a/core/src/main/java/jenkins/model/PeepholePermalink.java b/core/src/main/java/jenkins/model/PeepholePermalink.java
index d36ab3f86f..b4667d32a9 100644
--- a/core/src/main/java/jenkins/model/PeepholePermalink.java
+++ b/core/src/main/java/jenkins/model/PeepholePermalink.java
@@ -178,18 +178,7 @@ public abstract class PeepholePermalink extends Permalink implements Predicate<R
                     cw.write(target);
                     cw.commit();
                 } finally {
-                    try {
-                        cw.abort();
-                    }
-                    catch (IOException ioe) {
-                        // swallow exception
-                    }
-                    try {
-                        cw.close();
-                    }
-                    catch (IOException ioe) {
-                        // swallow exception
-                    }
+                    cw.abort();
                 }
             } else {
                 cache.delete();