Return-Path: 
 <notifications-return-17129-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
X-Original-To: apmail-ant-notifications-archive@minotaur.apache.org
Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0E1ED794C
	for <apmail-ant-notifications-archive@minotaur.apache.org>;
 Fri, 28 Oct 2011 10:48:29 +0000 (UTC)
Received: (qmail 73079 invoked by uid 500); 28 Oct 2011 10:48:29 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 73045 invoked by uid 500); 28 Oct 2011 10:48:28 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 73038 invoked by uid 99); 28 Oct 2011 10:48:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 10:48:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 10:48:27 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 364A1238897A
	for <notifications@ant.apache.org>; Fri, 28 Oct 2011 10:48:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1190244 - in /ant/core/trunk: WHATSNEW
 src/main/org/apache/tools/ant/taskdefs/Javac.java
Date: Fri, 28 Oct 2011 10:48:07 -0000
To: notifications@ant.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111028104807.364A1238897A@eris.apache.org>

Author: bodewig
Date: Fri Oct 28 10:48:06 2011
New Revision: 1190244

URL: http://svn.apache.org/viewvc?rev=1190244&view=rev
Log:
whitespace only

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1190244&r1=1190243&r2=1190244&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Oct 28 10:48:06 2011
@@ -25,9 +25,9 @@ Fixed bugs:
 
  * MailLogger ignore the Maillogger.starttls.enable property.
    Bugzilla Report 50668.
-   
+
  * Delete task example does not work
-   Bugzilla Report 50816.  
+   Bugzilla Report 50816.
 
  * <splash>'s proxy handling has been delegated to <setproxy>
    internally so the two tasks are consistent.  <splash>'s way of not
@@ -55,10 +55,10 @@ Fixed bugs:
 
  * Exec task may mix the stderr and stdout output while logging it
    Bugzilla Report 50507.
-   
+
  * Missing space between "finished" and timestamp in task/target 
    finish message from ProfileLogger.
-   Bugzilla Report 51109.     
+   Bugzilla Report 51109.
 
  * Redirecting the output of a java, exec or apply task could print in the
    error output stream some "Pipe broken" errors.
@@ -120,7 +120,7 @@ Other changes:
  * <junit filtertrace="true"/> will no longer filter out the very
    first line of the stacktrace containing the original exception
    message even if it matches one of the filter expressions.
-   
+
  * Upgraded to Apache AntUnit 1.2
 
  * Provide read access to Mkdir.dir.  Bugzilla Report 51684.
@@ -175,7 +175,7 @@ Changes that could break older environme
  * The list elements returned by ProjectHelper#getExtensionStack are
    now String arrays of length 3 rather than 2 in order to support the
    onMissingExtensionPoint attribute.
-   Bugzilla Report 49473.   
+   Bugzilla Report 49473.
 
  * When using <property file="..." prefix="..."/> properties defined
    inside the same file will only get used in expansions if the ${}
@@ -213,7 +213,7 @@ Fixed bugs:
    For large files this is not feasible. 
    We now explicitly request to copy at most 16 MiB per request.
    Bugzilla Report 49326.
-   
+
  * DemuxInputStream.read() should return unsigned values
    Bugzilla Report 49279.
 
@@ -371,7 +371,7 @@ Other changes:
    defined or silently work as plain targets if it hasn't.  This is
    useful for targets that get included/imported in different
    scenarios where a given extension-point may or may not exist.
-   Bugzilla Report 49473.   
+   Bugzilla Report 49473.
 
  * Ant now logs a warning message if it fails to change the file
    modification time in for example when using <touch> or preserving
@@ -443,8 +443,8 @@ Changes that could break older environme
 
  * Ant no longer ships with Apache Xerces-J or the XML APIs but relies
    on the Java runtime to provide a parser and matching API versions.
-   
- * The stylebook ant task and the ant-stylebook.jar are removed.  
+
+ * The stylebook ant task and the ant-stylebook.jar are removed.
 
 Fixed bugs:
 -----------
@@ -466,38 +466,38 @@ Fixed bugs:
 
  * VectorSet#remove(Object) would fail if the size of the vector
    equaled its capacity.
-   
+
  * Regression : ant -diagnostics was returning with exit code 1
    Bugzilla Report 48782
-   
+
  * Fix for exec task sometimes inserts extraneous newlines
    Bugzilla Report 48746
-   
+
  * SymlinkTest#testSymbolicLinkUtilsMethods failing on MacOS
    Bugzilla Report 48785.
 
  * If <concat>'s first resourcecollection child is a <resources>,
    any subsequently added child resourcecollection joins the first.
-   Bugzilla Report 48816.        
-   
+   Bugzilla Report 48816.
+
  * <get> with an invalid URL could trigger an NPE in some JVMs.
    Bugzilla Report 48833
-   
+
  * Broken Pipe issue under Ubuntu Linux
    Bugzilla Report 48789
-   
+
  * Properties wrongly read from file or not update during read
-   Bugzilla Report 48768       
+   Bugzilla Report 48768
 
  * AntClassLoader in Ant 1.8.0 has been considerably slower than in
    1.7.1
    Bugzilla Report 48853
-   
+
  * ANT_CMD_LINE_ARGS are rippling through lower level Ant usage 
    Bugzilla Report 48876
-   
+
  * email : IO error sending mail with plain mimetype
-   Bugzilla Report 48932    
+   Bugzilla Report 48932
 
  * the complete-ant-cmd.pl script failed to create a proper cache of
    target if "ant -p" failed.
@@ -541,7 +541,7 @@ Other changes:
 
  * The <zip> family of tasks has been sped up for bigger archives.
    Bugzilla Report 48755.
-   
+
  * Add removeKeepExtension option to NetRexxC task.
    Bugzilla Report 48788.
 
@@ -556,11 +556,11 @@ Other changes:
    of Object args as strings; previously only API-level usage of the
    equals condition allowed Object args, but Ant 1.8.x+ property
    evaluation may yield values of any type.
-   
+
  * BuildFileTest.assertPropertyUnset() fails with a slightly more 
    meaningful error message
    Bugzilla Report 48834
-   
+
  * <junit> will now throw an exception if a test name is empty.  This
    used to manifest itself in unrelated errors like
    Bugzilla Report 43586.
@@ -608,9 +608,9 @@ Fixed bugs:
    the jarjar links task and protentially other third-party subclasses
    as well.
    Bugzilla Report 48541.
-   
+
  * <scp> task didn't report build file location when a remote operation failed
-   Bugzilla Report 48578.  
+   Bugzilla Report 48578.
 
  * <propertyfile> would add the same comment and a date line each time
    it updated an existing property file.
@@ -676,7 +676,7 @@ Changes that could break older environme
    The TempFile task still does not create the file by default, can be
    instructed to do so however using a new parameter.
    Bugzilla Report 33969.
-  
+
  * A lock in Project ensured that a BuildListener's messageLogged
    method was only ever executed by a single thread at a time, while
    all other methods could be invoked by multiple threads
@@ -845,10 +845,10 @@ Fixed bugs:
 
  * <symlink> task couldn't overwrite files that were in the way of the symlink.
    Bugzilla Report 43426.
-   
+
  * <symlink> task failonerror="false" does not stop build from failing
    when 'ln' command returns non-zero.
-   Bugzilla Report 43624  
+   Bugzilla Report 43624
 
  * <touch> task couldn't differentiate between "no resources
    specified" and "no resources matched."
@@ -861,7 +861,7 @@ Fixed bugs:
  * <globmapper> had an indexoutofbounds when the prefix and postfix
    overlapped.
    Bugzilla Report 44731.
-   
+
  * <typedef> and <taskdef> failed to accept file names with #
    characters in them.
    Bugzilla Report 45190
@@ -914,7 +914,7 @@ Fixed bugs:
  * <filterset> sometimes incorrectly flagged infinite recursions of
    filter tokens
    Bugzilla Report 44226.
-   
+
  * failures were treated as errors in forked JUnit tests when JUnit 4
    was used.
    Bugzilla Report 43892.
@@ -1176,15 +1176,15 @@ Other changes:
    to provide filenames, rather than require that all resources
    are instances or subclasses of FileResource.
    Bugzilla Report 43348
-   
+
  * There is now a URLProvider interface for resources that act as a
    source of URLs. This should be used by tasks that require resources
    to provide URLs, rather than require that all resources are
    instances or subclasses of URLResource.
-   
+
  * Fixcrlf now gives better error messages on bad directory attributes.
    Bugzilla Report 43936
-   
+
  * a new property ant.project.default-target holds the value of the
    current <project>'s default attribute.
 
@@ -1593,7 +1593,7 @@ Other changes:
  * It is now possible to suppress the "FAILED" lines sent to Ant's
    logging system via <junit>'s new logFailedTests attribute.
    Bugzilla Report 35073.
-   
+
  * <propertyfile> now can delete entries.
 
  * The <resources> resource collection can now optionally cache its
@@ -1641,7 +1641,7 @@ Other changes:
    be loaded from the specified classpath rather than the system
    classloader.
    Bugzilla Report 41369.
-   
+
  * <property location="from" basedir="to" relative="true"/> can now
    calculate relative paths.
 
@@ -1656,7 +1656,7 @@ Other changes:
  * <import> can now import non-File resources if they provide an URL
    - as the <url> and <javaresource> resources do.
    Bugzilla Report 29251
-   
+
  * <import> can now import multiple resources specified as resource
    collections.
    Bugzilla Report 22269.
@@ -1735,7 +1735,7 @@ Fixed bugs:
 
 * SPI support in jar was broken.
   Bugzilla report 41201.
-  
+
 * jsch-0.1.30 causes SCP task to hang
   Bugzilla report 41090.
 
@@ -1795,7 +1795,7 @@ Fixed bugs:
   Bugzilla 42946
 
 * <junit> supports collecting and rerunning failed test cases
-  (textXXX methods). Bugzilla 42984.  
+  (textXXX methods). Bugzilla 42984.
 
 * War task failed with "No WEB-INF/web.xml file was added" when called
   a second time. Bugzilla 43121.
@@ -1876,7 +1876,7 @@ Other changes:
   <comment> nested element as nested text instead of using the 'value'
   attribute.
 
-* A new logger, BigProjectLogger, lists the project name with every target   
+* A new logger, BigProjectLogger, lists the project name with every target
 
 * Default text added to macrodef. Bugzilla report 42301.
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java?rev=1190244&r1=1190243&r2=1190244&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java Fri Oct 28 10:48:06 2011
@@ -949,7 +949,7 @@ public class Javac extends MatchingTask 
     protected void scanDir(File srcDir, File destDir, String[] files) {
         GlobPatternMapper m = new GlobPatternMapper();
         String[] extensions = findSupportedFileExtensions();
-        
+
         for (int i = 0; i < extensions.length; i++) {
             m.setFrom(extensions[i]);
             m.setTo("*.class");
@@ -1147,15 +1147,15 @@ public class Javac extends MatchingTask 
             if (adapter.execute()) {
                 // Success
                 if (createMissingPackageInfoClass) {
-                try {
-                    generateMissingPackageInfoClasses(destDir != null
-                                                      ? destDir
-                                                      : getProject()
-                                                      .resolveFile(src.list()[0]));
-                } catch (IOException x) {
-                    // Should this be made a nonfatal warning?
-                    throw new BuildException(x, getLocation());
-                }
+                    try {
+                        generateMissingPackageInfoClasses(destDir != null
+                                                          ? destDir
+                                                          : getProject()
+                                                          .resolveFile(src.list()[0]));
+                    } catch (IOException x) {
+                        // Should this be made a nonfatal warning?
+                        throw new BuildException(x, getLocation());
+                    }
                 }
             } else {
                 // Fail path