ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/util FileUtils.java
Date Fri, 04 Jul 2003 13:22:43 GMT
conor       2003/07/04 06:22:43

  Modified:    src/main/org/apache/tools/ant/util FileUtils.java
  Log:
  Remove double-check pattern.
  
  Revision  Changes    Path
  1.46      +29 -24    ant/src/main/org/apache/tools/ant/util/FileUtils.java
  
  Index: FileUtils.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -w -u -r1.45 -r1.46
  --- FileUtils.java	26 Jun 2003 15:21:13 -0000	1.45
  +++ FileUtils.java	4 Jul 2003 13:22:43 -0000	1.46
  @@ -136,6 +136,8 @@
   
       /**
        * Factory method.
  +     *
  +     * @return a new instance of FileUtils.
        */
       public static FileUtils newFileUtils() {
           return new FileUtils();
  @@ -144,7 +146,8 @@
       /**
        * Empty constructor.
        */
  -    protected FileUtils() {}
  +    protected FileUtils() {
  +    }
   
       /**
        * Get the URL for a file taking into account # characters
  @@ -544,7 +547,6 @@
           if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) {
               return null;
           }
  -        if (setLastModified == null) {
               synchronized (lockReflection) {
                   if (setLastModified == null) {
                       try {
  @@ -557,7 +559,6 @@
                       }
                   }
               }
  -        }
           return setLastModified;
       }
   
  @@ -867,12 +868,16 @@
               if (in1 != null) {
                   try {
                       in1.close();
  -                } catch (IOException e) {}
  +                } catch (IOException e) {
  +                    // ignore
  +                }
               }
               if (in2 != null) {
                   try {
                       in2.close();
  -                } catch (IOException e) {}
  +                } catch (IOException e) {
  +                    // ignore
  +                }
               }
           }
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message