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/controls/VLVControlTestCase.java |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
index 011483a..f082910 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
@@ -509,8 +509,8 @@
     requestControls.add(new VLVRequestControl(0, 3, 1, 0));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -602,8 +602,8 @@
     requestControls.add(new VLVRequestControl(0, 3, 0, 0));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -695,8 +695,8 @@
     requestControls.add(new VLVRequestControl(0, 3, 3, 0));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -787,8 +787,8 @@
     requestControls.add(new VLVRequestControl(0, 3, -1, 0));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -845,8 +845,8 @@
     requestControls.add(new VLVRequestControl(3, 3, 1, 0));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -902,8 +902,8 @@
     requestControls.add(new VLVRequestControl(3, 3, 30, 0));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -974,8 +974,8 @@
     requestControls.add(new VLVRequestControl(0, 3, 7, 0));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1066,8 +1066,8 @@
     requestControls.add(new VLVRequestControl(0, 3, ByteString.valueOf("a")));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1160,8 +1160,8 @@
                                               ByteString.valueOf("aaccf")));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1254,8 +1254,8 @@
                                               ByteString.valueOf("albert")));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1348,8 +1348,8 @@
                                               ByteString.valueOf("albert")));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),
@@ -1442,8 +1442,8 @@
     requestControls.add(new VLVRequestControl(0, 3, ByteString.valueOf("zz")));
 
     InternalSearchOperation internalSearch =
-         new InternalSearchOperation(conn, conn.nextOperationID(),
-                  conn.nextMessageID(), requestControls,
+         new InternalSearchOperation(conn, InternalClientConnection.nextOperationID(),
+                  InternalClientConnection.nextMessageID(), requestControls,
                   DN.decode("dc=example,dc=com"), SearchScope.WHOLE_SUBTREE,
                   DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                   SearchFilter.createFilterFromString("(objectClass=person)"),

--
Gitblit v1.10.0