Author: bodewig
Date: Thu Jun 19 05:20:50 2008
New Revision: 669465
URL: http://svn.apache.org/viewvc?rev=669465&view=rev
Log:
whitespace changes
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/Project.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=669465&r1=669464&r2=669465&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Jun 19 05:20:50 2008
@@ -65,9 +65,9 @@
* <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
+ * <typedef> and <taskdef> failed to accept file names with #
+ characters in them.
+ Bugzilla report 45190
* A deadlock could occur if a BuildListener tried to access an Ant property
within messageLogged while a different thread also accessed one.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/Project.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Project.java?rev=669465&r1=669464&r2=669465&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Project.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Project.java Thu Jun 19
05:20:50 2008
@@ -2147,32 +2147,32 @@
} else {
event.setMessage(message, priority);
}
- if (isLoggingMessage.get() != Boolean.FALSE) {
- /*
- * One of the Listeners has attempted to access
- * System.err or System.out.
- *
- * We used to throw an exception in this case, but
- * sometimes Listeners can't prevent it(like our own
- * Log4jListener which invokes getLogger() which in
- * turn wants to write to the console).
- *
- * @see http://marc.theaimsgroup.com/?t=110538624200006&r=1&w=2
- *
- * We now (Ant 1.6.3 and later) simply swallow the message.
- */
- return;
- }
- try {
- isLoggingMessage.set(Boolean.TRUE);
- Iterator iter = listeners.iterator();
- while (iter.hasNext()) {
- BuildListener listener = (BuildListener) iter.next();
- listener.messageLogged(event);
- }
- } finally {
- isLoggingMessage.set(Boolean.FALSE);
+ if (isLoggingMessage.get() != Boolean.FALSE) {
+ /*
+ * One of the Listeners has attempted to access
+ * System.err or System.out.
+ *
+ * We used to throw an exception in this case, but
+ * sometimes Listeners can't prevent it(like our own
+ * Log4jListener which invokes getLogger() which in
+ * turn wants to write to the console).
+ *
+ * @see http://marc.theaimsgroup.com/?t=110538624200006&r=1&w=2
+ *
+ * We now (Ant 1.6.3 and later) simply swallow the message.
+ */
+ return;
+ }
+ try {
+ isLoggingMessage.set(Boolean.TRUE);
+ Iterator iter = listeners.iterator();
+ while (iter.hasNext()) {
+ BuildListener listener = (BuildListener) iter.next();
+ listener.messageLogged(event);
}
+ } finally {
+ isLoggingMessage.set(Boolean.FALSE);
+ }
}
/**
