From ab598138dd9ba22fc500add4e62e459b5efa7b13 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Tue, 9 Nov 2021 19:56:28 +0300
Subject: [PATCH] Object rename fix

---
 .../service/navigator/impl/WebServiceNavigator.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
index 7f7b347908..9082e0f98d 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
@@ -272,7 +272,12 @@ public class WebServiceNavigator implements DBWServiceNavigator {
                     Map<String, Object> options = new LinkedHashMap<>();
                     DBECommandContext commandContext = new WebCommandContext(executionContext, false);
                     objectRenamer.renameObject(commandContext, object, options, newName);
-                    commandContext.saveChanges(session.getProgressMonitor(), options);
+                    try {
+                        commandContext.saveChanges(session.getProgressMonitor(), options);
+                    } catch (DBException e) {
+                        commandContext.resetChanges(true);
+                        throw e;
+                    }
                     return node.getName();
                 }
             }