Skip to content

Commit 0b94fde

Browse files
committed
Add strings isNullOrEmpty check
1 parent 52ad8a4 commit 0b94fde

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

database-commons/src/main/java/io/cdap/plugin/db/DBErrorDetailsProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.cdap.cdap.api.exception.ProgramFailureException;
2626
import io.cdap.cdap.etl.api.exception.ErrorContext;
2727
import io.cdap.cdap.etl.api.exception.ErrorDetailsProvider;
28-
import io.cdap.plugin.util.DBUtils;
2928

3029
import java.sql.SQLException;
3130
import java.util.List;
@@ -77,7 +76,7 @@ private ProgramFailureException getProgramFailureException(SQLException e, Error
7776
errorMessageWithDetails = String.format("%s For more details, see %s", errorMessageWithDetails,
7877
externalDocumentationLink);
7978
}
80-
return ErrorUtils.getProgramFailureException(sqlState == null ?
79+
return ErrorUtils.getProgramFailureException(!Strings.isNullOrEmpty(sqlState) ?
8180
new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN) : getErrorCategoryFromSqlState(sqlState),
8281
errorMessage, errorMessageWithDetails, getErrorTypeFromErrorCode(errorCode, sqlState), true,
8382
ErrorCodeType.SQLSTATE, sqlState, externalDocumentationLink, e);

postgresql-plugin/src/main/java/io/cdap/plugin/postgres/PostgresErrorDetailsProvider.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package io.cdap.plugin.postgres;
1818

19+
import com.google.common.base.Strings;
1920
import io.cdap.cdap.api.exception.ErrorCategory;
2021
import io.cdap.cdap.api.exception.ErrorType;
2122
import io.cdap.plugin.db.DBErrorDetailsProvider;
@@ -77,15 +78,17 @@ protected String getExternalDocumentationLink() {
7778

7879
@Override
7980
protected ErrorType getErrorTypeFromErrorCode(int errorCode, String sqlState) {
80-
if (sqlState.length() >= 2 && ERROR_CODE_TO_ERROR_TYPE.containsKey(sqlState.substring(0, 2))) {
81-
return ERROR_CODE_TO_ERROR_TYPE.get(sqlState.substring(0, 2));
81+
if (!Strings.isNullOrEmpty(sqlState) && sqlState.length() >= 2 &&
82+
ERROR_CODE_TO_ERROR_TYPE.containsKey(sqlState.substring(0, 2))) {
83+
return ERROR_CODE_TO_ERROR_TYPE.get(sqlState.substring(0, 2));
8284
}
8385
return ErrorType.UNKNOWN;
8486
}
8587

8688
@Override
8789
protected ErrorCategory getErrorCategoryFromSqlState(String sqlState) {
88-
if (sqlState.length() >= 2 && ERROR_CODE_TO_ERROR_CATEGORY.containsKey(sqlState.substring(0, 2))) {
90+
if (!Strings.isNullOrEmpty(sqlState) && sqlState.length() >= 2 &&
91+
ERROR_CODE_TO_ERROR_CATEGORY.containsKey(sqlState.substring(0, 2))) {
8992
return ERROR_CODE_TO_ERROR_CATEGORY.get(sqlState.substring(0, 2));
9093
}
9194
return new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN);

0 commit comments

Comments
 (0)