From 00d37e85955e374be365f1c34de5af1f69a6476c Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
index d1eeb07..38ea5a1 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.quicksetup.installer.ui;
@@ -215,7 +216,7 @@
*/
private String getDefaultValue(FieldName fieldName)
{
- String value = null;
+ String value;
switch (fieldName)
{
case GLOBAL_ADMINISTRATOR_UID:
--
Gitblit v1.10.0