java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java | 7 ++++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 11
+++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 0d6d46f29e666cff294689b471a6a363f83c9077
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 11:48:30 2011 +0200
683200 - encode hostname to IDN in DuplicateHostName.do page
diff --git a/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
b/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
index 2eab6c9..62634fb 100644
--- a/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
+++ b/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
@@ -50,6 +50,13 @@ public class DuplicateSystemGrouping implements Expandable,
Identifiable {
}
/**
+ * @param newKey String Set new key
+ */
+ public void setKey(String newKey) {
+ key = newKey;
+ }
+
+ /**
* Add a object to the bucket if there is a match
*
* @param net the object to add
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index f1f9b7b..b80653b 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -87,12 +87,14 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.ListIterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.net.IDN;
/**
* SystemManager
@@ -2764,8 +2766,15 @@ public class SystemManager extends BaseManager {
* @return List of DuplicateSystemBucket objects
*/
public static List listDuplicatesByHostname(User user, Long inactiveHours) {
- return listDuplicates(user, "duplicate_system_ids_hostname",
+ List<DuplicateSystemGrouping> duplicateSystems = listDuplicates(user,
+ "duplicate_system_ids_hostname",
Collections.EMPTY_LIST, inactiveHours);
+ ListIterator litr = duplicateSystems.listIterator();
+ while (litr.hasNext()) {
+ DuplicateSystemGrouping element = (DuplicateSystemGrouping)litr.next();
+ element.setKey(IDN.toUnicode(element.getKey()));
+ }
+ return duplicateSystems;
}
/**
Show replies by date