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/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java b/opends/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
index 860c925..30f07a5 100644
--- a/opends/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
+++ b/opends/src/server/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
@@ -41,6 +41,7 @@
import org.opends.server.types.*;
import static org.opends.messages.ProtocolMessages.*;
+import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.util.ServerConstants.*;
@@ -438,7 +439,7 @@
InternalClientConnection conn = socket.getConnection();
AddOperationBasis op =
- new AddOperationBasis(conn, conn.nextOperationID(),
+ new AddOperationBasis(conn, InternalClientConnection.nextOperationID(),
messageID, message.getControls(),
request.getDN(),
request.getAttributes());
@@ -487,7 +488,7 @@
InternalClientConnection conn = socket.getConnection();
BindOperationBasis op =
- new BindOperationBasis(conn, conn.nextOperationID(),
+ new BindOperationBasis(conn, nextOperationID(),
messageID, message.getControls(),
String.valueOf(request.getProtocolVersion()),
request.getDN(), request.getSimplePassword());
@@ -531,7 +532,7 @@
InternalClientConnection conn = socket.getConnection();
CompareOperationBasis op =
- new CompareOperationBasis(conn, conn.nextOperationID(),
+ new CompareOperationBasis(conn, nextOperationID(),
messageID, message.getControls(), request.getDN(),
request.getAttributeType(),
request.getAssertionValue());
@@ -571,7 +572,7 @@
InternalClientConnection conn = socket.getConnection();
DeleteOperationBasis op =
- new DeleteOperationBasis(conn, conn.nextOperationID(),
+ new DeleteOperationBasis(conn, nextOperationID(),
messageID, message.getControls(), request.getDN());
op.run();
@@ -619,7 +620,7 @@
InternalClientConnection conn = socket.getConnection();
ExtendedOperationBasis op =
- new ExtendedOperationBasis(conn, conn.nextOperationID(),
+ new ExtendedOperationBasis(conn, nextOperationID(),
messageID, message.getControls(), request.getOID(),
request.getValue());
op.run();
@@ -659,7 +660,7 @@
InternalClientConnection conn = socket.getConnection();
ModifyOperationBasis op =
- new ModifyOperationBasis(conn, conn.nextOperationID(),
+ new ModifyOperationBasis(conn, nextOperationID(),
messageID, message.getControls(), request.getDN(),
request.getModifications());
op.run();
@@ -698,7 +699,7 @@
InternalClientConnection conn = socket.getConnection();
ModifyDNOperationBasis op =
- new ModifyDNOperationBasis(conn, conn.nextOperationID(),
+ new ModifyDNOperationBasis(conn, nextOperationID(),
messageID, message.getControls(), request.getEntryDN(),
request.getNewRDN(), request.deleteOldRDN(),
request.getNewSuperior());
@@ -738,7 +739,7 @@
InternalClientConnection conn = socket.getConnection();
InternalSearchOperation op =
- new InternalSearchOperation(conn, conn.nextOperationID(),
+ new InternalSearchOperation(conn, nextOperationID(),
messageID, message.getControls(), request.getBaseDN(),
request.getScope(), request.getDereferencePolicy(),
request.getSizeLimit(), request.getTimeLimit(),
--
Gitblit v1.10.0