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/util/LDIFReader.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
index 5538b5b..62cb7e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java
@@ -858,15 +858,14 @@
}
//The attribute is not being ignored so check for binary option.
- if(checkSchema && !attrType.getSyntax().isBEREncodingRequired())
+ if(checkSchema
+ && !attrType.getSyntax().isBEREncodingRequired()
+ && attribute.hasOption("binary"))
{
- if(attribute.hasOption("binary"))
- {
- LocalizableMessage message = ERR_LDIF_INVALID_ATTR_OPTION.get(
- entryDN, lastEntryLineNumber, attrName);
- logToRejectWriter(lines, message);
- throw new LDIFException(message, lastEntryLineNumber,true);
- }
+ LocalizableMessage message = ERR_LDIF_INVALID_ATTR_OPTION.get(
+ entryDN, lastEntryLineNumber, attrName);
+ logToRejectWriter(lines, message);
+ throw new LDIFException(message, lastEntryLineNumber,true);
}
if (checkSchema &&
(DirectoryServer.getSyntaxEnforcementPolicy() !=
--
Gitblit v1.10.0