Browse Source

Merge pull request #10157 in DESIGN/design from final/11.0 to release/11.0

* commit '35e3d28c7af7728e0a121ddada357d0f125e04b7':
  REPORT-80922 远程设计下存储过程结果加载状态NPE
release/11.0
superman 2 years ago
parent
commit
86c5b8834c
  1. 12
      designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java

12
designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java

@ -187,18 +187,20 @@ public final class MultiResultTableDataWrapper implements TableDataWrapper {
protected Void doInBackground() throws Exception {
loadingBar.close();
PreviewTablePane.resetPreviewTable();
connectionBar.start();
// 存储过程需要先测试一下连接
if (tableData instanceof StoreProcedure) {
boolean status = DataOperator.getInstance().testConnection(((StoreProcedure) getTableData()).getDatabaseConnection());
if (!status) {
try {
connectionBar.start();
boolean success = DataOperator.getInstance().testConnection(((StoreProcedure) getTableData()).getDatabaseConnection());
if (!success) {
throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
}
} finally {
connectionBar.close();
throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
}
}
connectionBar.close();
tableData.resetDataModelList();
// 获取结果

Loading…
Cancel
Save