From b7cfa6d516bfc843b3157cd0e15df3e93128ee72 Mon Sep 17 00:00:00 2001 From: Magesh Umasankar Date: Tue, 20 Nov 2001 03:02:18 +0000 Subject: [PATCH] 1. Ensure javac does not report deprecation warnings. 2. Close fileoutputstream for every iteration. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269966 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/Checksum.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index aa4d0965f..91a7b6bfb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -53,10 +53,11 @@ */ package org.apache.tools.ant.taskdefs; -import java.io.DataInputStream; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.InputStreamReader; import java.io.IOException; import java.security.DigestInputStream; import java.security.MessageDigest; @@ -377,15 +378,14 @@ public class Checksum extends MatchingTask implements Condition { if (existingFile.exists() && existingFile.length() == checksum.length()) { fis = new FileInputStream(existingFile); - DataInputStream edis = new DataInputStream(fis); - String suppliedChecksum = ""; - if (edis.available() > 0) { - suppliedChecksum = edis.readLine(); - } + InputStreamReader isr = new InputStreamReader(fis); + BufferedReader br = new BufferedReader(isr); + String suppliedChecksum = br.readLine(); fis.close(); fis = null; - edis.close(); - checksumMatches = + br.close(); + isr.close(); + checksumMatches = checksum.equals(suppliedChecksum); } else { checksumMatches = false; @@ -394,6 +394,8 @@ public class Checksum extends MatchingTask implements Condition { File dest = (File) destination; fos = new FileOutputStream(dest); fos.write(checksum.getBytes()); + fos.close(); + fos = null; } } }