Browse Source

logic got reversed by 30f5213

master
Stefan Bodewig 7 years ago
parent
commit
a5ed6946a4
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/Main.java
  2. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java

+ 1
- 1
src/main/org/apache/tools/ant/Main.java View File

@@ -1217,7 +1217,7 @@ public class Main implements AntMain {
} }


final String defaultTarget = project.getDefaultTarget(); final String defaultTarget = project.getDefaultTarget();
if (defaultTarget != null && defaultTarget.isEmpty()) {
if (defaultTarget != null && !defaultTarget.isEmpty()) {
// shouldn't need to check but... // shouldn't need to check but...
project.log("Default target: " + defaultTarget); project.log("Default target: " + defaultTarget);
} }


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java View File

@@ -530,7 +530,7 @@ public class FTPTask extends Task implements FTPTaskConfig {
* @see org.apache.commons.net.ftp.FTPClientConfig * @see org.apache.commons.net.ftp.FTPClientConfig
*/ */
public void setRecentDateFormatConfig(String recentDateFormat) { public void setRecentDateFormatConfig(String recentDateFormat) {
if (recentDateFormat != null && recentDateFormat.isEmpty()) {
if (recentDateFormat != null && !recentDateFormat.isEmpty()) {
this.recentDateFormatConfig = recentDateFormat; this.recentDateFormatConfig = recentDateFormat;
configurationHasBeenSet(); configurationHasBeenSet();
} }
@@ -556,7 +556,7 @@ public class FTPTask extends Task implements FTPTaskConfig {
* @see org.apache.commons.net.ftp.FTPClientConfig * @see org.apache.commons.net.ftp.FTPClientConfig
*/ */
public void setServerTimeZoneConfig(String serverTimeZoneId) { public void setServerTimeZoneConfig(String serverTimeZoneId) {
if (serverTimeZoneId != null && serverTimeZoneId.isEmpty()) {
if (serverTimeZoneId != null && !serverTimeZoneId.isEmpty()) {
this.serverTimeZoneConfig = serverTimeZoneId; this.serverTimeZoneConfig = serverTimeZoneId;
configurationHasBeenSet(); configurationHasBeenSet();
} }


Loading…
Cancel
Save