From 67ea35cf7f71d98f37bc2d632ab6bc28218c1236 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 28 May 2010 09:52:02 +0000
Subject: [PATCH] Correct issues in MakeLDIF with ifPresentTag and ifAbsentTag
---
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java | 6 +++---
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java
index 82986ab..169c46b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tools.makeldif;
import org.opends.messages.Message;
@@ -169,14 +169,15 @@
}
String lowerName = toLowerCase(arguments[0]);
- AttributeType t = DirectoryServer.getAttributeType(lowerName, true);
- if (! template.hasAttribute(t))
+ attributeType = DirectoryServer.getAttributeType(lowerName, true);
+ if (! template.hasAttribute(attributeType))
{
Message message =
ERR_MAKELDIF_TAG_UNDEFINED_ATTRIBUTE.get(arguments[0], lineNumber);
throw new InitializationException(message);
}
+
if (arguments.length == 2)
{
assertionValue = arguments[1];
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java
index c58a53e..041e0c5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tools.makeldif;
import org.opends.messages.Message;
@@ -169,8 +169,8 @@
}
String lowerName = toLowerCase(arguments[0]);
- AttributeType t = DirectoryServer.getAttributeType(lowerName, true);
- if (! template.hasAttribute(t))
+ attributeType = DirectoryServer.getAttributeType(lowerName, true);
+ if (! template.hasAttribute(attributeType))
{
Message message =
ERR_MAKELDIF_TAG_UNDEFINED_ATTRIBUTE.get(arguments[0], lineNumber);
--
Gitblit v1.10.0