From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFReader.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 48b66c5..93e43f9 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
@@ -509,7 +509,7 @@
// This is a comment. Ignore it.
continue;
}
- else if ((line.charAt(0) == ' ') || (line.charAt(0) == '\t'))
+ else if (line.charAt(0) == ' ' || line.charAt(0) == '\t')
{
// This is a continuation of the previous line. If there is no
// previous line, then that's a problem. Note that while RFC 2849
@@ -633,7 +633,7 @@
{
final int length = line.length();
int pos = startPos;
- while ((pos < length) && (line.charAt(pos) == ' '))
+ while (pos < length && line.charAt(pos) == ' ')
{
pos++;
}
@@ -862,16 +862,14 @@
throw new LDIFException(message, lastEntryLineNumber,true);
}
if (checkSchema &&
- (DirectoryServer.getSyntaxEnforcementPolicy() !=
- AcceptRejectWarn.ACCEPT))
+ DirectoryServer.getSyntaxEnforcementPolicy() != AcceptRejectWarn.ACCEPT)
{
LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
if (! attrType.getSyntax().valueIsAcceptable(value, invalidReason))
{
LocalizableMessage message = WARN_LDIF_VALUE_VIOLATES_SYNTAX.get(
entryDN, lastEntryLineNumber, value, attrName, invalidReason);
- if (DirectoryServer.getSyntaxEnforcementPolicy() ==
- AcceptRejectWarn.WARN)
+ if (DirectoryServer.getSyntaxEnforcementPolicy() == AcceptRejectWarn.WARN)
{
logger.error(message);
}
@@ -916,7 +914,7 @@
logToRejectWriter(lines, message);
throw new LDIFException(message, lastEntryLineNumber, true);
}
- if (attrType.isSingleValue() && (a.size() > 1) && checkSchema)
+ if (attrType.isSingleValue() && a.size() > 1 && checkSchema)
{
LocalizableMessage message = ERR_LDIF_MULTIPLE_VALUES_FOR_SINGLE_VALUED_ATTR
.get(entryDN, lastEntryLineNumber, attrName);
@@ -1019,7 +1017,7 @@
{
try
{
- if ((message != null) && (message.length() > 0))
+ if (message != null && message.length() > 0)
{
rejectWriter.write("# ");
rejectWriter.write(message.toString());
@@ -1060,7 +1058,7 @@
entriesRejected.incrementAndGet();
if (rejectWriter != null) {
try {
- if ((message != null) && (message.length() > 0)) {
+ if (message != null && message.length() > 0) {
rejectWriter.write("# ");
rejectWriter.write(message.toString());
rejectWriter.newLine();
--
Gitblit v1.10.0