java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java | 4 ++++ java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 4 ---- java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 3 +-- java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-)
New commits: commit 6e8f14060148542c4fad156406da220d1528f0c2 Author: Tomas Lestach tlestach@redhat.com Date: Tue Mar 6 10:15:46 2012 +0100
Automatic commit of package [spacewalk-java] release [1.7.54-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 078355a..2ba7dd0 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.7.53 +Version: 1.7.54 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -585,6 +585,11 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Tue Mar 06 2012 Tomas Lestach tlestach@redhat.com 1.7.54-1 +- 799992 - remove the error message completely (tlestach@redhat.com) +- prevent ISE on the rhn/channels/manage/errata/AddCustomErrata.do page + (tlestach@redhat.com) + * Sat Mar 03 2012 Jan Pazdziora 1.7.53-1 - Removing the Downloads tab, it points to nonexisting /rhn/software/channel/downloads/Download.do page. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index f136982..62ce761 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.7.53-1 java/ +1.7.54-1 java/
commit 2999390f202e7001c33039f4ffc864adecbef9ef Author: Tomas Lestach tlestach@redhat.com Date: Mon Mar 5 18:23:52 2012 +0100
799992 - remove the error message completely
it caused NPE due to ksession = null (cherry picked from commit 3771ba9cd97164a46d2ba0d77d8e982faa6e6bef)
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java index b5d78a3..ff895ff 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -850,10 +850,6 @@ public class KickstartFormatter { log.debug("Found one time activation key: " + defaultKey.getKey()); } } - else { - log.error("We should have gotten an activation key with this session: " + - ksession.getId()); - } log.debug("tokens size: " + tokens.size()); //add the activation keys associated with the kickstart profile if (ksdata.getDefaultRegTokens() != null) {
commit 6b10f466cc963f79b3f11e1994ad056e95919aa5 Author: Tomas Lestach tlestach@redhat.com Date: Mon Mar 5 12:10:20 2012 +0100
prevent ISE on the rhn/channels/manage/errata/AddCustomErrata.do page
when selecting "All Custom Channels" and hitting "View Associated Errata" (cherry picked from commit 27e5b1af84e22b06d7b1c4373f270fb35a971ed6)
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java index c452209..8e7f701 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java @@ -29,6 +29,7 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager;
+import org.apache.commons.lang.StringUtils; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -103,6 +104,9 @@ public class AddCustomErrataAction extends RhnListAction { //If the channel submit button was clicked if (requestContext.wasDispatched(CHANNEL_SUBMIT)) { selectedChannelStr = request.getParameter(SELECTED_CHANNEL); + if (StringUtils.isEmpty(selectedChannelStr)) { + selectedChannelStr = null; + } // selectedChannelStr might be null }
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index 00903ac..a33623c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -47,8 +47,7 @@
<tr> <th width="10%">Channel:</th><td width="40%"> <select name="selected_channel"> - <option value="null" >All Custom Channels</option> - <option value="null" ></option> + <option value="" >All Custom Channels</option> <optgroup> <c:forEach var="option" items="${channel_list}"> <c:choose>
spacewalk-commits@lists.fedorahosted.org