summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/com/memberwebs/ldapxml/LXReader.java6
-rw-r--r--src/com/memberwebs/ldapxml/map/LXSAXHandler.java8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/com/memberwebs/ldapxml/LXReader.java b/src/com/memberwebs/ldapxml/LXReader.java
index 4f62c01..5323e8e 100644
--- a/src/com/memberwebs/ldapxml/LXReader.java
+++ b/src/com/memberwebs/ldapxml/LXReader.java
@@ -509,7 +509,7 @@ public class LXReader
{
// Get the syntax for conversion functions
- LDAPAttributeSchema schattr = m_schema.getAttributeSchema(ldapattr.getName());
+ LDAPAttributeSchema schattr = m_schema.getAttributeSchema(ldapattr.getBaseName());
String syntax = "";
if(schattr != null)
@@ -524,7 +524,7 @@ public class LXReader
// for each value.
while(values.hasMoreElements())
{
- String val = m_convert.parse(ldapattr.getName(),
+ String val = m_convert.parse(ldapattr.getBaseName(),
syntax, (String)values.nextElement());
if(val == null)
continue;
@@ -544,7 +544,7 @@ public class LXReader
while(values.hasMoreElements())
{
- String val = m_convert.parse(ldapattr.getName(),
+ String val = m_convert.parse(ldapattr.getBaseName(),
syntax, (String)values.nextElement());
if(val == null)
continue;
diff --git a/src/com/memberwebs/ldapxml/map/LXSAXHandler.java b/src/com/memberwebs/ldapxml/map/LXSAXHandler.java
index 8ede4bb..84a54e8 100644
--- a/src/com/memberwebs/ldapxml/map/LXSAXHandler.java
+++ b/src/com/memberwebs/ldapxml/map/LXSAXHandler.java
@@ -475,12 +475,12 @@ class LXSAXHandler
private void addName(LXBase base)
{
String name = base.getName();
- if(base.m_xmlName != null && !m_nameMap.contains(base.m_xmlName))
- m_nameMap.put(base.m_xmlName, name);
+ if(base.m_xmlName != null && !m_nameMap.containsKey(base.m_xmlName))
+ m_nameMap.put(base.m_xmlName, name);
String xmlName = base.getXmlName();
- if(xmlName != null && !m_nameMap.contains(xmlName))
- m_nameMap.put(xmlName, name);
+ if(xmlName != null && !m_nameMap.containsKey(xmlName))
+ m_nameMap.put(xmlName, name);
if(m_nameSet != null)
m_nameSet.add(name);