From cd4bf1fc9fdb26496d211ce205042c797fbdd915 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 08 Apr 2009 10:03:27 +0000
Subject: [PATCH] Fix for issue 3686 (makeldif does not parse redirect to file based attribute)
---
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java
index 8416391..ac06b2a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.tools.makeldif;
import org.opends.messages.Message;
@@ -35,7 +35,6 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -362,8 +361,7 @@
}
}
- Entry entry = templateEntry.toEntry();
- if (! entryWriter.writeEntry(entry))
+ if (! entryWriter.writeEntry(templateEntry))
{
return TagResult.STOP_PROCESSING;
}
@@ -371,8 +369,8 @@
for (int j=0; j < subordinateTemplates.length; j++)
{
TagResult r =
- subordinateTemplates[j].writeEntries(entryWriter, entry.getDN(),
- numEntriesPerTemplate[j]);
+ subordinateTemplates[j].writeEntries(entryWriter,
+ templateEntry.getDN(), numEntriesPerTemplate[j]);
if (! (r.keepProcessingParent() && r.keepProcessingTemplateFile()))
{
if (r.keepProcessingTemplateFile())
--
Gitblit v1.10.0