From 380d744c2f8e1cd1bc6c0b63028c508b8be8e6f8 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 11 Jun 2018 17:41:37 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-8665=2010.0=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E4=BF=9D=E5=AD=98=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/server/ConnectionListAction.java | 4 +++- .../com/fr/design/actions/server/GlobalTableDataAction.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java index e14b22b6d5..3b7881c3df 100644 --- a/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java @@ -68,7 +68,9 @@ public class ConnectionListAction extends UpdateAction { } protected void renameConnection(String oldName, String newName) { - datasourceManager.renameConnection(oldName, newName); + if(datasourceManager.getConnection(oldName) != null){ + datasourceManager.renameConnection(oldName, newName); + } } }; final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null); diff --git a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java index b723b9928a..946fa61f51 100644 --- a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java @@ -78,7 +78,9 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS Configurations.update(new Worker() { @Override public void run() { - tableDataConfig.renameTableData(oldName, newName); + if(tableDataConfig.getTableData(oldName) != null){ + tableDataConfig.renameTableData(oldName, newName); + } } @Override