Browse Source

ws

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@439363 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 19 years ago
parent
commit
6e42878c2d
2 changed files with 2 additions and 5 deletions
  1. +1
    -2
      src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
  2. +1
    -3
      src/main/org/apache/tools/ant/taskdefs/WaitFor.java

+ 1
- 2
src/main/org/apache/tools/ant/taskdefs/ConditionTask.java View File

@@ -1,5 +1,5 @@
/*
* Copyright 2001-2006 The Apache Software Foundation
* Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ import org.apache.tools.ant.taskdefs.condition.ConditionBase;
* <p>This task does not extend Task to take advantage of
* ConditionBase.</p>
*
*
* @since Ant 1.4
*
* @ant.task category="control"


+ 1
- 3
src/main/org/apache/tools/ant/taskdefs/WaitFor.java View File

@@ -1,5 +1,5 @@
/*
* Copyright 2001-2006 The Apache Software Foundation
* Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,7 +50,6 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
*
* @ant.task category="control"
*/

public class WaitFor extends ConditionBase {
/** default max wait time */
private long maxWaitMillis = 1000L * 60L * 3L;
@@ -139,7 +138,6 @@ public class WaitFor extends ConditionBase {
// ignore
}
}

processTimeout();
} finally {
maxWaitMillis = savedMaxWaitMillis;


Loading…
Cancel
Save