Stefan:

Thanks for applying this. It looks good.  I just noticed 
that a deprecation warning is being generated when
Checksum.java is compiled.  I am attaching a patch
to get rid of this warning for future compiles.

Thanks,
Magesh

On Fri, 16 Nov 2001 Stefan Bodewig wrote :
> Magesh,
> 
> I've committed your task, but modified it slightly to 
> ensure, all
> files get closed all the time.  Could you please check 
> whether
> everything is working?
> 
> Thanks
> 
>         Stefan

 
Index: Checksum.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.1
diff -u -r1.1 Checksum.java
--- Checksum.java       2001/11/16 12:30:58     1.1
+++ Checksum.java       2001/11/16 16:15:20
@@ -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 @@
                         if (existingFile.exists() &&
                             existingFile.length() == checksum.length()) {
                             fis = new FileInputStream(existingFile);
-                            DataInputStream edis = new DataInputStream(fis);
+                            BufferedReader br = new BufferedReader(
+                                new InputStreamReader(fis));
                             String suppliedChecksum = "";
-                            if (edis.available() > 0) {
-                                suppliedChecksum = edis.readLine();
-                            }
+                            suppliedChecksum = br.readLine();
                             fis.close();
                             fis = null;
-                            edis.close();
-                            checksumMatches = 
+                            br.close();
+                            checksumMatches =
                                 checksum.equals(suppliedChecksum);
                         } else {
                             checksumMatches = false;

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to