From b0edc6575b50bea5280d3faefa1eca34519be076 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 9 Mar 2001 08:47:48 +0000 Subject: [PATCH] Fix bug in P4 tasks when port, user or client have not been specified. Submitted by: Byrne Reese git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268780 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/perforce/P4Base.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index 4c8cf9f7d..647e23686 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -136,9 +136,15 @@ public abstract class P4Base extends org.apache.tools.ant.Task { commandline.setExecutable("p4"); //Check API for these - it's how CVS does it... - commandline.createArgument().setValue(P4Port); - commandline.createArgument().setValue(P4User); - commandline.createArgument().setValue(P4Client); + if (P4Port != null && P4Port.length() != 0) { + commandline.createArgument().setValue(P4Port); + } + if (P4User != null && P4User.length() != 0) { + commandline.createArgument().setValue(P4User); + } + if (P4Client != null && P4Client.length() != 0) { + commandline.createArgument().setValue(P4Client); + } commandline.createArgument().setLine(command); log("Execing "+commandline.getCommandline(), Project.MSG_VERBOSE);