From 300e65e22e4f93afaaf30d31a6e11ef5aedc3cf9 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 7 Aug 2024 23:57:31 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-114392=20FR-FBP=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AE=BE=E8=AE=A1=E9=80=82=E9=85=8D=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/connect/ConnectionListPane.java | 3 ++- .../java/com/fr/design/data/datapane/connect/JDBCDefPane.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java index 974f8b0d7b..d1e85492d1 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -334,7 +334,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh } - private void alterConnections(List addConnections, List removedConnNames, List updateConnection) { + private void alterConnections(List addConnections, List removedConnNames, List updateConnection) throws Exception { try { for (ConnectionInfoBean bean : addConnections) { @@ -352,6 +352,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh } } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); + throw e; } } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index 988ad0c94a..e8c7c17b8e 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -451,8 +451,8 @@ public class JDBCDefPane extends JPanel { jdbcDatabase.setPassword(new String(this.passwordTextField.getPassword()).trim()); jdbcDatabase.setOriginalCharsetName(this.originalCharSet); if (this.charSetComboBox.getSelectedIndex() == 0) { - jdbcDatabase.setNewCharsetName(StringUtils.EMPTY); - jdbcDatabase.setOriginalCharsetName(StringUtils.EMPTY); + jdbcDatabase.setNewCharsetName(null); + jdbcDatabase.setOriginalCharsetName(null); } else { jdbcDatabase.setNewCharsetName(EncodeConstants.ENCODING_GBK); jdbcDatabase.setOriginalCharsetName(((String) this.charSetComboBox.getSelectedItem()));