java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java |
16 ++++++----
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 66bedd40d89522305a446e1b98af1c9386077223
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 31 20:21:11 2011 +0200
fix NPE for KickstartDetailsEditAction
this partly reverts 4b9116c6
addressing:
java.lang.NullPointerException
at
com.redhat.rhn.manager.kickstart.KickstartEditCommand.setIsOrgDefault(KickstartEditCommand.java:171)
at
com.redhat.rhn.frontend.action.kickstart.KickstartDetailsEditAction.processFormValues(KickstartDetailsEditAction.java:223)
at
com.redhat.rhn.frontend.action.kickstart.BaseKickstartEditAction.execute(BaseKickstartEditAction.java:80)
at
com.redhat.rhn.frontend.action.kickstart.KickstartDetailsEditAction.execute(KickstartDetailsEditAction.java:95)
...
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
index 64935a4..4b6ed44 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
@@ -36,6 +36,7 @@ import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileEditCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
+import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -219,11 +220,16 @@ public class KickstartDetailsEditAction extends
BaseKickstartEditAction {
cmd.setLabel(form.getString(LABEL));
- cmd.setActive((Boolean) form.get(ACTIVE));
- cmd.setIsOrgDefault((Boolean) form.get(ORG_DEFAULT));
- cmd.getKickstartData().setPostLog((Boolean) form.get(POST_LOG));
- cmd.getKickstartData().setPreLog((Boolean) form.get(PRE_LOG));
- cmd.getKickstartData().setKsCfg((Boolean) form.get(KS_CFG));
+ cmd.setActive(new
+ Boolean(BooleanUtils.toBoolean((Boolean) form.get(ACTIVE))));
+ cmd.setIsOrgDefault(new
+ Boolean(BooleanUtils.toBoolean((Boolean) form.get(ORG_DEFAULT))));
+ cmd.getKickstartData().setPostLog(
+ BooleanUtils.toBoolean((Boolean) form.get(POST_LOG)));
+ cmd.getKickstartData().setPreLog(
+ BooleanUtils.toBoolean((Boolean) form.get(PRE_LOG)));
+ cmd.getKickstartData().setKsCfg(
+ BooleanUtils.toBoolean((Boolean) form.get(KS_CFG)));
processCobblerFormValues(cmd.getKickstartData(), form,
ctx.getLoggedInUser());
Show replies by thread