From 200e3372ce930ac356aa78bee8feb725a51fdd5b Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Thu, 23 Aug 2018 19:29:52 +0800
Subject: [PATCH] REPORT-10541

---
 .../data/datapane/connect/DatabaseConnectionPane.java      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index aa56e76b08..b796ab2d7f 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -34,6 +34,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private UIButton cancelButton;
     private JDialog dialog;
     private UILabel uiLabel;
+    private String oirginalCharSet = null;
+    private String newCharSet = null;
 
     // Database pane
     public DatabaseConnectionPane() {
@@ -67,6 +69,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     @Override
     public void populateBean(com.fr.data.impl.Connection ob) {
+        this.oirginalCharSet = ob.getOriginalCharsetName();
+        this.newCharSet = ob.getNewCharsetName();
 
         populateSubDatabaseConnectionBean((E) ob);
     }
@@ -77,6 +81,9 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     public com.fr.data.impl.Connection updateBean() {
         E ob = updateSubDatabaseConnectionBean();
 
+        ob.setOriginalCharsetName(this.oirginalCharSet);
+        ob.setNewCharsetName(this.newCharSet);
+
         return ob;
     }