From 66680d3613957ad09437fc8b64885a0ad87f9e53 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 30 Jul 2010 11:59:52 +0000
Subject: [PATCH] Extend RFC3672 subtreeSpecification to allow OpenDS specific RelativeSubtreeSpec and AbsoluteSubtreeSpec.
---
opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java b/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java
index 95e1319..125c65e 100644
--- a/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java
+++ b/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.core;
import org.opends.messages.Message;
@@ -287,13 +287,16 @@
public boolean isWithinScope(Entry entry) {
if (isDNWithinScope(entry.getDN())) {
- try {
- return filter.matchesEntry(entry);
- } catch (DirectoryException e) {
- // TODO: need to decide what to do with the exception here. It's
- // probably safe to ignore, but we could log it perhaps.
- return false;
+ if (filter != null) {
+ try {
+ return filter.matchesEntry(entry);
+ } catch (DirectoryException e) {
+ // TODO: need to decide what to do with the exception here. It's
+ // probably safe to ignore, but we could log it perhaps.
+ return false;
+ }
}
+ return true;
} else {
return false;
}
--
Gitblit v1.10.0