This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 23a113375a [IT] fix IT tests (#7098)
23a113375a is described below
commit 23a113375ac801241e28f82829f95674dee8555a
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Tue May 5 20:26:50 2026 +0200
[IT] fix IT tests (#7098)
---
core/src/main/java/org/apache/hop/core/Condition.java | 2 +-
.../hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/org/apache/hop/core/Condition.java
b/core/src/main/java/org/apache/hop/core/Condition.java
index edf377ed46..ced122d131 100644
--- a/core/src/main/java/org/apache/hop/core/Condition.java
+++ b/core/src/main/java/org/apache/hop/core/Condition.java
@@ -294,7 +294,7 @@ public class Condition implements Cloneable {
/** A condition is empty when the condition is atomic and no left field is
specified. */
public boolean isEmpty() {
- return (isAtomic() && leftValueName == null);
+ return (isAtomic() && (leftValueName == null || leftValueName.isEmpty()));
}
/**
diff --git
a/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java
b/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java
index 21c7a36070..1a7eda30aa 100644
---
a/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java
+++
b/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java
@@ -294,7 +294,7 @@ public class ActionMssqlBulkLoad extends ActionBase {
// Check Error file
String realErrorFile = resolve(errorFileName);
- if (realErrorFile != null) {
+ if (!Utils.isEmpty(realErrorFile)) {
File errorfile = new File(realErrorFile);
if (errorfile.exists() && !addDatetime) {
// The error file is created when the command is executed.
An error occurs if
@@ -365,7 +365,7 @@ public class ActionMssqlBulkLoad extends ActionBase {
sqlBulkLoad = sqlBulkLoad + "," + useCodepage;
}
String realFormatFile = resolve(formatFileName);
- if (realFormatFile != null) {
+ if (!Utils.isEmpty(realFormatFile)) {
sqlBulkLoad = sqlBulkLoad + ", FORMATFILE='" +
realFormatFile + "'";
}
if (fireTriggers) {
@@ -383,7 +383,7 @@ public class ActionMssqlBulkLoad extends ActionBase {
if (tabLock) {
sqlBulkLoad = sqlBulkLoad + ",TABLOCK";
}
- if (orderBy != null) {
+ if (!Utils.isEmpty(orderBy)) {
sqlBulkLoad = sqlBulkLoad + ",ORDER ( " + orderBy + " " +
orderDirection + ")";
}
if (!errorfileName.isEmpty()) {
