java/code/src/com/redhat/rhn/domain/token/Token.java | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 5271574e11094b8b8952c142e4c32ab86292ff9d
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Aug 30 19:28:43 2010 -0400
628100 - fix for Activation Keys - Config channels issue
diff --git a/java/code/src/com/redhat/rhn/domain/token/Token.java
b/java/code/src/com/redhat/rhn/domain/token/Token.java
index f92a53c..10248d0 100644
--- a/java/code/src/com/redhat/rhn/domain/token/Token.java
+++ b/java/code/src/com/redhat/rhn/domain/token/Token.java
@@ -33,6 +33,7 @@ import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -238,6 +239,7 @@ public class Token implements Identifiable {
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(final Object other) {
if (!(other instanceof Token)) {
return false;
@@ -258,6 +260,7 @@ public class Token implements Identifiable {
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
return new HashCodeBuilder().append(getId())
.append(getDisabled())
@@ -471,6 +474,11 @@ public class Token implements Identifiable {
*/
protected void setConfigChannels(List cfgChannels) {
this.configChannels = cfgChannels;
+ for (Iterator itr = configChannels.iterator(); itr.hasNext();) {
+ if (itr.next() == null) {
+ itr.remove();
+ }
+ }
}
/**
Show replies by date