Browse Source

Make starteam checkout handle deleted labels correctly.

PR: 17646
Submitted by:	Brian Brooks <brian dot brooks at metavante dot com>
Reviewed by:	Steve Cohen


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274317 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
6482a14b62
2 changed files with 3 additions and 1 deletions
  1. +2
    -0
      WHATSNEW
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java

+ 2
- 0
WHATSNEW View File

@@ -70,6 +70,8 @@ Fixed bugs:
StringIndexOutOfBoundsException on all OSes where os.name is shorter
than seven characters. Bugzilla Report 18105.

* starteam checkout can now handle deleted labels. Bugzilla Report 17646.

Other changes:
--------------
* The filesetmanifest attribute of <jar> has been reenabled.


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java View File

@@ -566,7 +566,7 @@ public abstract class TreeBasedTask extends StarTeamTask {
for (int i = 0; i < allLabels.length; i++) {
Label stLabel = allLabels[i];
log("checking label " + stLabel.getName(), Project.MSG_DEBUG);
if (stLabel.getName().equals(this.label)) {
if (stLabel != null && !stLabel.isDeleted() && stLabel.getName().equals(this.label)) {
if (!stLabel.isRevisionLabel() && !stLabel.isViewLabel()) {
throw new BuildException("Unexpected label type.");
}


Loading…
Cancel
Save