java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java | 12
++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 1656a475b8dc2cfec0e4f1c9d4caffe403ba4367
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Feb 25 11:54:17 2013 +0100
selecting of primary network interface should behave corectly with --nohardware
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
index a47d2d3..06efa0d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
@@ -102,10 +102,14 @@ public class SystemHardwareAction extends RhnAction {
private void setupForm(HttpServletRequest request, CPU cpu, Server server,
DynaActionForm daForm) {
- daForm.set("primaryInterface",
server.findPrimaryNetworkInterface().getName());
- request.setAttribute("primaryInterface",
- server.findPrimaryNetworkInterface().getName());
- request.setAttribute("networkInterfaces",
getNetworkInterfaces(server));
+ if (server.findPrimaryNetworkInterface() != null) {
+ daForm.set("primaryInterface",
server.findPrimaryNetworkInterface().getName());
+ request.setAttribute("primaryInterface",
+ server.findPrimaryNetworkInterface().getName());
+ }
+ if (server.getActiveNetworkInterfaces() != null) {
+ request.setAttribute("networkInterfaces",
getNetworkInterfaces(server));
+ }
request.setAttribute("system", server);
if (cpu != null) {
request.setAttribute("cpu_model", cpu.getModel());
Show replies by date