diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java index 1d3b0cc8a..e97f2fd51 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java @@ -39,7 +39,7 @@ public class P4Reopen extends P4Base { * @throws BuildException if the change parameter is null or empty */ public void setToChange(String toChange) throws BuildException { - if (toChange == null && !toChange.equals("")) { + if (toChange == null || toChange.equals("")) { throw new BuildException("P4Reopen: tochange cannot be null or empty"); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java index 57e6d01ff..e0c24f88e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java @@ -40,7 +40,7 @@ public class P4Revert extends P4Base { * @throws BuildException if the change list is null or empty string */ public void setChange(String revertChange) throws BuildException { - if (revertChange == null && !revertChange.equals("")) { + if (revertChange == null || revertChange.equals("")) { throw new BuildException("P4Revert: change cannot be null or empty"); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java index d2fd457df..77dab052c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java @@ -58,7 +58,7 @@ public class P4Sync extends P4Base { * @throws BuildException if label is null or empty string */ public void setLabel(String label) throws BuildException { - if (label == null && !label.equals("")) { + if (label == null || label.equals("")) { throw new BuildException("P4Sync: Labels cannot be Null or Empty"); }