java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java | 4 ++--
java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1d9847af191e625f6831a344947eb1371ac75997
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jan 13 13:52:00 2010 -0500
514759 - stripping space chars from activation keys
diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java
b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java
index b4c3af8..c060aaa 100644
--- a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java
@@ -114,10 +114,10 @@ public class ActivationKeyFactory extends HibernateFactory {
keyToUse = generateKey();
}
else {
- validateKeyName(key.trim());
+ validateKeyName(key.trim().replace(" ", ""));
}
- keyToUse = ActivationKey.makePrefix(user.getOrg()) + keyToUse.trim();
+ keyToUse = ActivationKey.makePrefix(user.getOrg()) +
keyToUse.trim().replace(" ", "");
if (server != null) {
keyToUse = "re-" + keyToUse;
diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java
b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java
index ee4e5b4..fc13bac 100644
--- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java
+++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java
@@ -428,7 +428,7 @@ public class ActivationKeyManager {
* @param user TODO
*/
public void changeKey(String newKey, ActivationKey key, User user) {
- newKey = newKey.trim();
+ newKey = newKey.trim().replace(" ", "");
String oldKey = key.getKey();
if (!newKey.equals(key.getKey())) {
ActivationKeyFactory.validateKeyName(newKey);
Show replies by date