From 2d7aad2c25507ea427980b54848c26594c607ae2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 20 Feb 2014 11:20:22 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
index 83178cb..a72c887 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
@@ -24,25 +24,24 @@
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2014 ForgeRock AS
*/
-
package org.opends.server.authorization.dseecompat;
-import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.api.EqualityMatchingRule;
-import static org.opends.messages.AccessControlMessages.
- WARN_PATTERN_DN_TYPE_CONTAINS_SUBSTRINGS;
-import static org.opends.messages.AccessControlMessages.
- WARN_PATTERN_DN_TYPE_WILDCARD_IN_MULTIVALUED_RDN;
import java.util.List;
import java.util.ArrayList;
import java.util.TreeMap;
import java.util.Set;
import java.util.Iterator;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DecodeException;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.server.api.EqualityMatchingRule;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.*;
+
+import static org.opends.messages.AccessControlMessages.*;
+
/**
* This class is used to match RDN patterns containing wildcards in either
* the attribute types or the attribute values.
@@ -317,11 +316,14 @@
return mr.areEqual(thisNormValue, thatNormValue);
}
}
+ catch (DecodeException e)
+ {
+ return false;
+ }
catch (DirectoryException e)
{
return false;
}
}
-
}
--
Gitblit v1.10.0