From 4ddd6b5efef03e30ee14a6e05c31efbb7fdf4719 Mon Sep 17 00:00:00 2001
From: xiqiu <xiqiu@fanruan.com>
Date: Mon, 12 Apr 2021 18:06:34 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-49023=20=20=20=E6=A0=B9=E6=8D=AEpr?=
 =?UTF-8?q?=E6=9D=A5=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/DatabaseConnectionPane.java       | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

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 436849936e..16c992b0f3 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
@@ -8,6 +8,7 @@ import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.data.operator.DataOperator;
 import com.fr.data.solution.ExceptionSolutionSelector;
+import com.fr.data.solution.entity.DriverPage;
 import com.fr.data.solution.processor.ClassNotFoundExceptionSolutionProcessor;
 import com.fr.data.solution.processor.SolutionProcessor;
 import com.fr.design.beans.BasicBeanPane;
@@ -87,6 +88,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                 protected Void doInBackground() throws Exception {
                     Connection database = DatabaseConnectionPane.this.updateBean();
                     // 返回连接结果
+                    DriverPage.updateCache();
                     DataOperator.getInstance().testConnectionWithException(database);
                     return null;
                 }
@@ -121,30 +123,34 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                             deatail.setText(content);
                             deatail.setToolTipText(content);
                             gridJpanel.add(deatail);
+                            String solution = select.getResultException().getSolution();
                             UILabel redirect = new UILabel();
-                            redirect.setText(Toolkit.i18nText("Fine_Designer_Download_Driver"));
-                            redirect.setForeground(Color.BLUE);
-
-                            redirect.addMouseListener(new MouseAdapter() {
-                                @Override
-                                public void mouseClicked(MouseEvent e) {
-                                    try {
-                                        Desktop.getDesktop().browse(new URI(select.getResultException().getSolution()));
-                                    } catch (Exception clickException) {
-                                        FineLoggerFactory.getLogger().warn("can not open browser with {}", select.getResultException().getSolution());
+                            if (solution != null) {
+                                redirect.setText(Toolkit.i18nText("Fine_Designer_Download_Driver"));
+                                redirect.setForeground(Color.BLUE);
+                                redirect.addMouseListener(new MouseAdapter() {
+                                    @Override
+                                    public void mouseClicked(MouseEvent e) {
+                                        try {
+                                            Desktop.getDesktop().browse(new URI(solution));
+                                        } catch (Exception clickException) {
+                                            FineLoggerFactory.getLogger().warn("can not open browser with {}", solution);
+                                        }
                                     }
-                                }
 
-                                @Override
-                                public void mouseEntered(MouseEvent e) {
-                                    redirect.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-                                }
+                                    @Override
+                                    public void mouseEntered(MouseEvent e) {
+                                        redirect.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                                    }
 
-                                @Override
-                                public void mouseExited(MouseEvent e) {
-                                    redirect.setCursor(Cursor.getDefaultCursor());
-                                }
-                            });
+                                    @Override
+                                    public void mouseExited(MouseEvent e) {
+                                        redirect.setCursor(Cursor.getDefaultCursor());
+                                    }
+                                });
+                            } else {
+                                redirect.setText(Toolkit.i18nText("Fine_Designer_Not_Found_Driver_No_Solution"));
+                            }
                             gridJpanel.add(redirect);
                             hiddenPanel.add(gridJpanel);
                             gridJpanel.setBackground(Color.WHITE);