From 5d1cdcb43a80bd7b8e314d5b3cf38c3adb78f1c9 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 21 Jan 2011 08:42:13 +0000
Subject: [PATCH] Code cleanup removing potential issues detected by FindBugs
---
opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java
index 046fa6f..04b8b89 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/AciSyntax.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.schema;
@@ -63,18 +64,9 @@
*/
private static final DebugTracer TRACER = getTracer();
-
-
-
- // The default approximate matching rule for this syntax.
- private ApproximateMatchingRule defaultApproximateMatchingRule;
-
// The default equality matching rule for this syntax.
private EqualityMatchingRule defaultEqualityMatchingRule;
- // The default ordering matching rule for this syntax.
- private OrderingMatchingRule defaultOrderingMatchingRule;
-
// The default substring matching rule for this syntax.
private SubstringMatchingRule defaultSubstringMatchingRule;
@@ -99,9 +91,6 @@
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException
{
- // We don't need an approximate matching rule.
- defaultApproximateMatchingRule = null;
-
defaultEqualityMatchingRule =
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_IA5_OID);
if (defaultEqualityMatchingRule == null)
@@ -110,9 +99,6 @@
EMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME));
}
- // We don't need an ordering matching rule.
- defaultOrderingMatchingRule = null;
-
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_IA5_OID);
if (defaultSubstringMatchingRule == null)
@@ -185,7 +171,8 @@
*/
public OrderingMatchingRule getOrderingMatchingRule()
{
- return defaultOrderingMatchingRule;
+ // We don't have an orderingMatchingRule
+ return null;
}
@@ -215,7 +202,8 @@
*/
public ApproximateMatchingRule getApproximateMatchingRule()
{
- return defaultApproximateMatchingRule;
+ // we don't have an approximateMatchingRule
+ return null;
}
--
Gitblit v1.10.0