From 635ff4018ff896e021485e4019963ed79a1ec3c7 Mon Sep 17 00:00:00 2001
From: jcambon <jcambon@localhost>
Date: Wed, 11 Mar 2009 10:28:04 +0000
Subject: [PATCH] Fix for issue #3863 : dsconfig exception when trying to set the subject-attribute in Subject DN To User Attribute Certificate Mapper
---
opends/src/server/org/opends/server/types/AttributeType.java | 12 ++++++++++--
opends/build.xml | 7 ++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 078072e..6b15c58 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1426,6 +1426,8 @@
<dirset dir="${classes.dir}" />
</classpath>
<jvmarg value="-Dorg.opends.server.scriptName=dsconfig" />
+ <jvmarg value="-Dorg.opends.server.BuildRoot=${pdir}"/>
+ <jvmarg value="-Dorg.opends.server.ServerRoot=${pdir}"/>
</java>
</target>
@@ -1448,7 +1450,10 @@
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
<jvmarg value="-Dorg.opends.server.scriptName=dsconfig" />
- </java>
+ <jvmarg value="-Dorg.opends.server.BuildRoot=${pdir}"/>
+ <jvmarg value="-Dorg.opends.server.ServerRoot=${pdir}"/>
+ <jvmarg value="-Dorg.opends.server.debug.enabled=true"/>
+ </java>
</target>
diff --git a/opends/src/server/org/opends/server/types/AttributeType.java b/opends/src/server/org/opends/server/types/AttributeType.java
index 12206e1..8dcb168 100644
--- a/opends/src/server/org/opends/server/types/AttributeType.java
+++ b/opends/src/server/org/opends/server/types/AttributeType.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.types;
@@ -68,7 +68,7 @@
mayInvoke=true)
public final class AttributeType
extends CommonSchemaElements
- implements SchemaFileElement
+ implements SchemaFileElement, Comparable<AttributeType>
{
/**
* The tracer object for the debug logger.
@@ -751,5 +751,13 @@
buffer.append(attributeUsage.toString());
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compareTo(AttributeType o) {
+ return getNormalizedPrimaryNameOrOID().compareTo(
+ o.getNormalizedPrimaryNameOrOID());
+ }
}
--
Gitblit v1.10.0