From 6482a14b629a377711b3df5fd883f2bced525aa9 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 27 Mar 2003 08:02:15 +0000 Subject: [PATCH] Make starteam checkout handle deleted labels correctly. PR: 17646 Submitted by: Brian Brooks Reviewed by: Steve Cohen git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274317 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 ++ .../tools/ant/taskdefs/optional/starteam/TreeBasedTask.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 9ea14f0eb..909bfaebe 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -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 has been reenabled. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java index bdee983a2..4535ce423 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java @@ -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."); }