java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java | 4 +--- java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 3 ++- java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-)
New commits: commit 7ae2deda0e93cee83c2f9e9accb53d7655f0d4e9 Author: Tomas Lestach tlestach@redhat.com Date: Tue Feb 25 16:54:10 2014 +0100
Automatic commit of package [spacewalk-java] release [2.2.2-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 199f0e4..7d375cf 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -801,6 +801,10 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Tue Feb 25 2014 Tomas Lestach tlestach@redhat.com 2.2.2-1 +- initialize temporaryRoles within CreateUserCommand +- remove unnecessarily nested else statement + * Tue Feb 25 2014 Tomas Lestach tlestach@redhat.com 2.2.1-1 - store the bounce_url back in the login page form - rename label diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index f93c614..283b8b9 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.2.1-1 java/ +2.2.2-1 java/
commit 576d32ca1e17056dec7990ad47363359c7db0c7d Author: Tomas Lestach tlestach@redhat.com Date: Tue Feb 25 16:36:56 2014 +0100
initialize temporaryRoles within CreateUserCommand
diff --git a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java index c749a5e..4ec2ca7 100644 --- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java +++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java @@ -31,6 +31,7 @@ import com.redhat.rhn.frontend.events.NewUserEvent; import org.apache.commons.lang.StringUtils;
import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.SortedSet; @@ -50,7 +51,7 @@ public class CreateUserCommand { private Address addr; private boolean makeOrgAdmin; private boolean makeSatAdmin; - private Set<Role> temporaryRoles; + private Set<Role> temporaryRoles = new HashSet<Role>();
private List<ValidatorError> errors; private List<ValidatorError> passwordErrors;
commit 361bf8eadd2be6ef04aac3b599f240e78315be11 Author: Tomas Lestach tlestach@redhat.com Date: Tue Feb 25 16:34:52 2014 +0100
remove unnecessarily nested else statement
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java index 4977409..fe5c9c8 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java @@ -52,9 +52,7 @@ public class LocalizedSubmitTag extends SubmitTag { if (super.getStyleClass() != null) { return (super.getStyleClass() + " btn btn-default"); } - else { - return "btn btn-default"; - } + return "btn btn-default"; }
/** {@inheritDoc}
spacewalk-commits@lists.fedorahosted.org