From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
index cae3bf5..ac9667d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
@@ -148,13 +149,11 @@
throw ioException;
}
- if ((entryBytes == null) || (! entryBytes.hasRemaining()))
+ if ((entryBytes == null || !entryBytes.hasRemaining())
+ && !getNextEntry())
{
- if (! getNextEntry())
- {
- closed = true;
- return -1;
- }
+ closed = true;
+ return -1;
}
return (0xFF & entryBytes.get());
@@ -189,13 +188,11 @@
throw ioException;
}
- if ((entryBytes == null) || (! entryBytes.hasRemaining()))
+ if ((entryBytes == null || !entryBytes.hasRemaining())
+ && !getNextEntry())
{
- if (! getNextEntry())
- {
- closed = true;
- return -1;
- }
+ closed = true;
+ return -1;
}
int bytesRead = Math.min(len, entryBytes.remaining());
--
Gitblit v1.10.0