mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Violette Roche-Montane
21.36.2013 15bb0bb1eda75c0443f951ee0804791373bc2d02
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.
1 files modified
22 ■■■■■ changed files
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java 22 ●●●●● patch | view | raw | blame | history
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())