From 53aaaf1630b2347f67da9a13a5bf79ebb417314d Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 27 Nov 2013 07:56:03 +0000
Subject: [PATCH] CR-2635 OPENDJ-1196 updateSchemaFile succeeds if it can't find schema in the templates

---
 opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
index 2dd0f9c..2f195d5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -368,15 +368,10 @@
     }
     catch (ClientException ex)
     {
-      LOG.log(SEVERE, ex.getMessage());
-      println(Style.ERROR, ex.getMessageObject(), 0);
-
       return ex.getExitCode();
     }
     catch (Exception ex)
     {
-      LOG.log(SEVERE, ERR_UPGRADE_MAIN_UPGRADE_PROCESS.get(ex
-          .getMessage()).toString());
       println(Style.ERROR, ERR_UPGRADE_MAIN_UPGRADE_PROCESS.get(ex
           .getMessage()), 0);
 
@@ -425,9 +420,6 @@
           println(Style.ERROR, Message.raw(fnc.getMessage()), 1);
           LOG.log(Level.SEVERE, fnc.getMessage());
           break;
-        case BREAKLINE:
-          println(Style.BREAKLINE, Message.raw(fnc.getMessage()), 1);
-          break;
         case WARNING:
           println(Style.WARNING, Message.raw(fnc.getMessage()), 2);
           LOG.log(Level.WARNING, fnc.getMessage());

--
Gitblit v1.10.0