From 15bb0bb1eda75c0443f951ee0804791373bc2d02 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 21 Aug 2013 12:36:18 +0000
Subject: [PATCH] OPENDJ-1099 control-panel can not connect to remote server unless a local OpenDJ instance is configured - buildinfo is not verified if remote is detected.
---
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index 8678d74..e4b6213 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -103,21 +103,25 @@
System.exit(ErrorReturnCode.ERROR_PARSING_ARGS.getReturnCode());
}
- // If we should just display usage or version information,
+ // If we should just display usage or version information,
// then print it and exit.
- if (argParser.usageOrVersionDisplayed()) {
+ if (argParser.usageOrVersionDisplayed())
+ {
System.exit(ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode());
}
// Checks the version - if upgrade required, the tool is unusable
- try
+ if (!argParser.isRemote())
{
- BuildVersion.checkVersionMismatch();
- }
- catch (InitializationException e)
- {
- System.err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
- System.exit(ErrorReturnCode.ERROR_UNEXPECTED.getReturnCode());
+ try
+ {
+ BuildVersion.checkVersionMismatch();
+ }
+ catch (InitializationException e)
+ {
+ System.err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
+ System.exit(ErrorReturnCode.ERROR_UNEXPECTED.getReturnCode());
+ }
}
if (!argParser.usageOrVersionDisplayed())
--
Gitblit v1.10.0