Browse Source

whitespace changes

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@669465 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 17 years ago
parent
commit
018b7a9ded
2 changed files with 28 additions and 28 deletions
  1. +3
    -3
      WHATSNEW
  2. +25
    -25
      src/main/org/apache/tools/ant/Project.java

+ 3
- 3
WHATSNEW View File

@@ -65,9 +65,9 @@ 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
* <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.


+ 25
- 25
src/main/org/apache/tools/ant/Project.java View File

@@ -2147,32 +2147,32 @@ public class Project implements ResourceFactory {
} 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);
}
}

/**


Loading…
Cancel
Save