summaryrefslogtreecommitdiff
path: root/src/com/memberwebs
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/memberwebs')
-rw-r--r--src/com/memberwebs/ldapxml/map/LXMap.java6
-rw-r--r--src/com/memberwebs/ldapxml/map/LXSAXHandler.java2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/memberwebs/ldapxml/map/LXMap.java b/src/com/memberwebs/ldapxml/map/LXMap.java
index 2676f18..b12c984 100644
--- a/src/com/memberwebs/ldapxml/map/LXMap.java
+++ b/src/com/memberwebs/ldapxml/map/LXMap.java
@@ -63,6 +63,9 @@ public class LXMap
// Cache of the name set
private Set m_nameSet;
+ // Whether to use the nameset or not
+ boolean m_hasInclusive;
+
/**
* Constructs a new LXMap object.
*/
@@ -71,6 +74,7 @@ public class LXMap
super(null);
m_nameMap = nameMap;
m_nameSet = nameSet;
+ m_hasInclusive = false;
}
@@ -107,7 +111,7 @@ public class LXMap
*/
public final Set getNameSet()
{
- return m_nameSet;
+ return m_hasInclusive ? null : m_nameSet;
}
/**
diff --git a/src/com/memberwebs/ldapxml/map/LXSAXHandler.java b/src/com/memberwebs/ldapxml/map/LXSAXHandler.java
index d81c240..8ede4bb 100644
--- a/src/com/memberwebs/ldapxml/map/LXSAXHandler.java
+++ b/src/com/memberwebs/ldapxml/map/LXSAXHandler.java
@@ -418,7 +418,7 @@ class LXSAXHandler
else if(inc.equals(VAL_INCLUSIVE))
{
// We don't know the list of names
- m_nameSet = null;
+ m_map.m_hasInclusive = true;
cls.m_isInclusive = true;
}
else