Fix for issue 3328 (Server is started with options "-client -Xms8m" when st...

jvergara

13.01.2008 c4bfbbc9e48ec9949bf083e714cd3850433f4ccb

Fix for issue 3328 (Server is started with options "-client -Xms8m" when started by status-panel)

The fix consists on removing the OPENDS_JAVA_ARGS value that is set by the scripts when launching the client utilities (setup, upgrade, status-panel) when we create the new start process.

 opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java

@@ -582,7 +582,7 @@
    argList.toArray(args);
    ProcessBuilder pb = new ProcessBuilder(args);
    Map<String, String> env = pb.environment();
    env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
    env.remove(SetupUtils.OPENDS_JAVA_ARGS);
    try
    {
      Process process = pb.start();
@@ -696,8 +696,7 @@
    argList.toArray(args);
    ProcessBuilder pb = new ProcessBuilder(args);
    Map<String, String> env = pb.environment();
    env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));

    env.remove(SetupUtils.OPENDS_JAVA_ARGS);
    try
    {
      Process process = pb.start();

 opends/src/server/org/opends/server/util/SetupUtils.java

@@ -62,6 +62,11 @@
  public static final String OPENDS_JAVA_HOME = "OPENDS_JAVA_HOME";

  /**
   * Specific environment variable used by the scripts to set java arguments.
   */
  public static final String OPENDS_JAVA_ARGS = "OPENDS_JAVA_ARGS";

  /**
   * Java property used to know which are the jar files that must be downloaded
   * lazily.  The current code in WebStartDownloader that uses this property
   * assumes that the URL are separated with an space.