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/NewSuffixOptions.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/NewSuffixOptions.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/NewSuffixOptions.java
index fb017fa..9737982 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/NewSuffixOptions.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/NewSuffixOptions.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2013 ForgeRock AS.
  */
 
 
@@ -161,8 +162,7 @@
    */
   public LinkedList<String> getLDIFPaths()
   {
-    LinkedList<String> copy = new LinkedList<String>(ldifPaths);
-    return copy;
+    return new LinkedList<String>(ldifPaths);
   }
 
   /**
@@ -206,7 +206,6 @@
    */
   public LinkedList<String> getBaseDns()
   {
-    LinkedList<String> copy = new LinkedList<String>(baseDns);
-    return copy;
+    return new LinkedList<String>(baseDns);
   }
 }

--
Gitblit v1.10.0