From 78a26a979db4a0b5c1fe178881410c55ece1d758 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 27 Jan 2010 22:01:06 +0000
Subject: [PATCH] Fix for issue 4517 (Cannot use control panel to edit entry in replicated base DN after a binary update happened in the entry) Treat the ds-sync-hist in a special manner. It is an attribute with DirectoryString syntax but it can contain byte[] values expressed in a String format which can completely break the UI and the entry processing.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index 7386aa1..aef18ec 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -174,6 +174,10 @@
public void update(CustomSearchResult sr, boolean isReadOnly, TreePath path)
{
boolean sameEntry = false;
+ if (sr != null)
+ {
+ sr = filterSearchResult(sr);
+ }
if ((searchResult != null) && (sr != null))
{
sameEntry = searchResult.getDN().equals(sr.getDN());
@@ -189,7 +193,7 @@
this.treePath = path;
updateTitle(sr, path);
ignoreEntryChangeEvents = true;
- tableModel.displayEntry(searchResult);
+ tableModel.displayEntry();
Utilities.updateTableSizes(table);
Utilities.updateScrollMode(scroll, table);
SwingUtilities.invokeLater(new Runnable()
@@ -458,10 +462,10 @@
private boolean sortAscending = true;
/**
- * Sets the entry to be displayed by this table model.
- * @param searchResult the entry to be displayed.
+ * Updates the contents of the table model with the
+ * {@code TableViewEntryPanel.searchResult} object.
*/
- public void displayEntry(CustomSearchResult searchResult)
+ public void displayEntry()
{
updateDataArray();
fireTableDataChanged();
--
Gitblit v1.10.0