From d9722bcadc7bf619808426fc82cbb0c74b1646b0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 09 Sep 2010 17:31:59 +0000
Subject: [PATCH] Make EntryReader and ChangeRecordReader APIs easier to use:

---
 sdk/src/com/sun/opends/sdk/tools/LDAPModify.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sdk/src/com/sun/opends/sdk/tools/LDAPModify.java b/sdk/src/com/sun/opends/sdk/tools/LDAPModify.java
index 885a450..c62ad71 100644
--- a/sdk/src/com/sun/opends/sdk/tools/LDAPModify.java
+++ b/sdk/src/com/sun/opends/sdk/tools/LDAPModify.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2009 Sun Microsystems, Inc.
+ *      Copyright 2009-2010 Sun Microsystems, Inc.
  */
 
 package com.sun.opends.sdk.tools;
@@ -762,13 +762,12 @@
         reader = new LDIFChangeRecordReader(getInputStream());
       }
 
-      ChangeRecord cr;
       try
       {
-        int result;
-        while ((cr = reader.readChangeRecord()) != null)
+        while (reader.hasNext())
         {
-          result = cr.accept(visitor, null);
+          final ChangeRecord cr = reader.readChangeRecord();
+          final int result = cr.accept(visitor, null);
           if (result != 0 && !continueOnError.isPresent())
           {
             return result;

--
Gitblit v1.10.0