From 1a3a07f47d0c6e9452e39dd0472a3356434782bf Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 15:34:27 +0000
Subject: [PATCH] Batch of changes that : - Update BDB JE to version 4.0.95 - Remove BDB logging configuration and definitely fix issue 4367  - Resolve issue 4523 - ACI and sub-entry caches not updated on replicas - Update the build factory to warn about generated messages on precommit - Resolve some issues in the Control Panel - Fix an issue with java.properties being ignored by some CLI

---
 opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java |   87 +++++++++++++++++++++++++------------------
 1 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index 64860fc..f3e68a9 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2007-2009 Sun Microsystems, Inc.
+ *      Copyright 2007-2010 Sun Microsystems, Inc.
  */
 
 package org.opends.server.admin.client.cli;
@@ -990,44 +990,48 @@
     TrustManagerProviderCfg trustManagerCfg = null;
     AdministrationConnectorCfg administrationConnectorCfg = null;
 
+    boolean couldInitializeConfig = configurationInitialized;
     // Initialization for admin framework
     if (!configurationInitialized) {
-      initializeConfiguration();
+      couldInitializeConfig = initializeConfiguration();
     }
-    // Get the Directory Server configuration handler and use it.
-    RootCfg root =
-      ServerManagementContext.getInstance().getRootConfiguration();
-    administrationConnectorCfg = root.getAdministrationConnector();
+    if (couldInitializeConfig)
+    {
+      // Get the Directory Server configuration handler and use it.
+      RootCfg root =
+        ServerManagementContext.getInstance().getRootConfiguration();
+      administrationConnectorCfg = root.getAdministrationConnector();
 
-    String trustManagerStr =
-      administrationConnectorCfg.getTrustManagerProvider();
-    trustManagerCfg = root.getTrustManagerProvider(trustManagerStr);
-    if (trustManagerCfg instanceof FileBasedTrustManagerProviderCfg) {
-      FileBasedTrustManagerProviderCfg fileBasedTrustManagerCfg =
-        (FileBasedTrustManagerProviderCfg) trustManagerCfg;
-      String truststoreFile = fileBasedTrustManagerCfg.getTrustStoreFile();
-      // Check the file
-      if (truststoreFile.startsWith(File.separator)) {
-        truststoreFileAbsolute = truststoreFile;
-      } else {
-        truststoreFileAbsolute =
-          DirectoryServer.getInstanceRoot() + File.separator + truststoreFile;
-      }
-      File f = new File(truststoreFileAbsolute);
-      if (!f.exists() || !f.canRead() || f.isDirectory())
-      {
-        truststoreFileAbsolute = null;
-      }
-      else
-      {
-        // Try to get the canonical path.
-        try
-        {
-          truststoreFileAbsolute = f.getCanonicalPath();
+      String trustManagerStr =
+        administrationConnectorCfg.getTrustManagerProvider();
+      trustManagerCfg = root.getTrustManagerProvider(trustManagerStr);
+      if (trustManagerCfg instanceof FileBasedTrustManagerProviderCfg) {
+        FileBasedTrustManagerProviderCfg fileBasedTrustManagerCfg =
+          (FileBasedTrustManagerProviderCfg) trustManagerCfg;
+        String truststoreFile = fileBasedTrustManagerCfg.getTrustStoreFile();
+        // Check the file
+        if (truststoreFile.startsWith(File.separator)) {
+          truststoreFileAbsolute = truststoreFile;
+        } else {
+          truststoreFileAbsolute =
+            DirectoryServer.getInstanceRoot() + File.separator + truststoreFile;
         }
-        catch (Throwable t)
+        File f = new File(truststoreFileAbsolute);
+        if (!f.exists() || !f.canRead() || f.isDirectory())
         {
-          // We can ignore this error.
+          truststoreFileAbsolute = null;
+        }
+        else
+        {
+          // Try to get the canonical path.
+          try
+          {
+            truststoreFileAbsolute = f.getCanonicalPath();
+          }
+          catch (Throwable t)
+          {
+            // We can ignore this error.
+          }
         }
       }
     }
@@ -1041,13 +1045,22 @@
    */
   public int getAdminPortFromConfig() throws ConfigException
   {
+    int port;
     // Initialization for admin framework
+    boolean couldInitializeConfiguration = configurationInitialized;
     if (!configurationInitialized) {
-      initializeConfiguration();
+      couldInitializeConfiguration = initializeConfiguration();
     }
-    RootCfg root =
-      ServerManagementContext.getInstance().getRootConfiguration();
-    int port = root.getAdministrationConnector().getListenPort();
+    if (couldInitializeConfiguration)
+    {
+      RootCfg root =
+        ServerManagementContext.getInstance().getRootConfiguration();
+      port = root.getAdministrationConnector().getListenPort();
+    }
+    else
+    {
+      port = AdministrationConnector.DEFAULT_ADMINISTRATION_CONNECTOR_PORT;
+    }
     return port;
   }
 

--
Gitblit v1.10.0