commit 6c72a48fff83836756e273bf680717afed48989f
author Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> Tue Nov 12 12:44:26 2019 -0500
committer Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> Wed Nov 13 23:51:37 2019 +0000
tree 01d3ddc6445e2fbe10eeacd84e14e8324a2e36b6
parent 62d1f6eecef737cacdc911e9f84baf5364520f2d

Change log messages of noteDb case to match reviewDb case

Bug: Issue 11734
Change-Id: I2ff06eba0aa0af5d3935486f5373a20a73d1e892

src/main/java/com/googlesource/gerrit/plugins/renameproject/database/DatabaseRenameHandler.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/renameproject/database/DatabaseRenameHandler.java b/src/main/java/com/googlesource/gerrit/plugins/renameproject/database/DatabaseRenameHandler.java
index cac3338..671dc27 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/renameproject/database/DatabaseRenameHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/renameproject/database/DatabaseRenameHandler.java
@@ -215,13 +215,18 @@
       updateWatchEntries(oldProjectKey, newProjectKey);
     } catch (OrmException e) {
       log.error(
-          "Failed to update changes in noteDb for the project {}, rolling back the operation.",
-          oldProjectKey.get());
+          "Failed to update changes in noteDb for project {}, exception caught: {}. Rolling back the operation.",
+          oldProjectKey.get(),
+          e.toString());
       try {
         updateWatchEntries(newProjectKey, oldProjectKey);
-      } catch (OrmException ex) {
-        log.error("Failed to revert watched projects after catching {}", e.getMessage());
-        throw ex;
+      } catch (OrmException revertEx) {
+        log.error(
+            "Failed to rollback changes in noteDb from project {} to project {}, exception caught: {}",
+            newProjectKey.get(),
+            oldProjectKey.get(),
+            revertEx.toString());
+        throw new RenameRevertException(revertEx, e);
       }
       throw e;
     }