From 14f94c13789b8ace4eae258b5f1d64494518f9c3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 21 Dec 2015 14:04:12 +0000
Subject: [PATCH] Remove null checks on returned values of Entry.get*Attribute*() methods.
---
opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
index fbf597d..7d72fef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -140,19 +140,15 @@
// Make sure all configured attributes have clean values.
for (AttributeType t : config.getAttributeType())
{
- List<Attribute> attrList = entry.getAttribute(t);
- if (attrList != null)
+ for (Attribute a : entry.getAttribute(t))
{
- for (Attribute a : attrList)
+ for (ByteString v : a)
{
- for (ByteString v : a)
+ if (!is7BitClean(v))
{
- if (!is7BitClean(v))
- {
- LocalizableMessage rejectMessage =
- ERR_PLUGIN_7BIT_IMPORT_ATTR_NOT_CLEAN.get(a.getNameWithOptions());
- return PluginResult.ImportLDIF.stopEntryProcessing(rejectMessage);
- }
+ LocalizableMessage rejectMessage =
+ ERR_PLUGIN_7BIT_IMPORT_ATTR_NOT_CLEAN.get(a.getNameWithOptions());
+ return PluginResult.ImportLDIF.stopEntryProcessing(rejectMessage);
}
}
}
--
Gitblit v1.10.0