From 108e2020c1d149962dfc43dcbc6bc24a05a8e5f7 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 19 Jun 2012 10:26:26 +0000
Subject: [PATCH] Fix OPENDJ-525: Remove compiler warnings when building using JDK7

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
index 12aa771..477ac14 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
@@ -38,11 +38,6 @@
 
 import org.opends.server.TestCaseUtils;
 import org.opends.server.core.DirectoryServer;
-import org.opends.server.util.Base64;
-
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
 import static org.testng.Assert.*;
 
 
@@ -420,9 +415,10 @@
     File newTargetFile = File.createTempFile("difftest", "newtarget.ldif");
     newTargetFile.deleteOnExit();
 
+    DirectoryServer.getInstance();
     args = new String[]
     {
-      "-c", DirectoryServer.getInstance().getConfigFile(),
+      "-c", DirectoryServer.getConfigFile(),
       "-s", sourceFile,
       "-m", diffOutputFile.getAbsolutePath(),
       "-t", newTargetFile.getAbsolutePath()
@@ -508,9 +504,10 @@
     File newTargetFile = File.createTempFile("difftest", "newtarget.ldif");
     newTargetFile.deleteOnExit();
 
+    DirectoryServer.getInstance();
     args = new String[]
     {
-      "-c", DirectoryServer.getInstance().getConfigFile(),
+      "-c", DirectoryServer.getConfigFile(),
       "-s", sourceFile,
       "-m", diffOutputFile.getAbsolutePath(),
       "-t", newTargetFile.getAbsolutePath()

--
Gitblit v1.10.0