From 0d1119f92ba0455deeeaf7f92d4905f77a18da53 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 17 Jun 2016 08:42:29 +0000
Subject: [PATCH] Moved exception handling of upgrade tasks to a higher level

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
index 68cddea..f79be75 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
@@ -771,7 +771,14 @@
       context.notify(INFO_UPGRADE_PERFORMING_TASKS.get(), TITLE_CALLBACK);
       for (final UpgradeTask task : tasks)
       {
-        task.perform(context);
+        try
+        {
+          task.perform(context);
+        }
+        catch (ClientException e)
+        {
+          handleClientException(context, e);
+        }
       }
 
       if (UpgradeTasks.countErrors == 0)

--
Gitblit v1.10.0