java/code/src/com/redhat/rhn/domain/server/Server.java | 3 ++-
java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 9 ++++++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 721d0ebaef5947f1ceb68c27bafd033a3fe6ccd6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 4 16:45:56 2011 +0200
Automatic commit of package [spacewalk-java] release [1.4.28-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 1db279e..0b334b6 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.4.27
+Version: 1.4.28
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -532,6 +532,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Apr 04 2011 Miroslav Suchý 1.4.28-1
+- when hostname is unknown print "unknown"
+- 683200 - IDN.toUnicode does not allow null value
+
* Mon Apr 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.27-1
- fixed queries on Virtual system Overview page
- correct form property
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bfe0fdc..e6977a6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.27-1 java/
+1.4.28-1 java/
commit 889ffb93bb201e86ff93b6520629c974b1356371
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 4 16:39:55 2011 +0200
when hostname is unknown print "unknown"
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
index 6681a89..6110a6c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
@@ -144,7 +144,14 @@
<bean:message key="sdc.details.hardware.network_hostname"/>
</th>
<td>
- ${network_hostname}
+ <c:choose>
+ <c:when test="${network_hostname == null}">
+ <bean:message key="sdc.details.overview.unknown"/>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${network_hostname}" />
+ </c:otherwise>
+ </c:choose>
</td>
</tr>
<tr>
commit 4b4b1650ef4cd40b491764a949dee44506bcaf04
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 4 16:25:37 2011 +0200
683200 - IDN.toUnicode does not allow null value
addressing:
java.lang.NullPointerException
at java.net.IDN.toUnicode(IDN.java:170)
at java.net.IDN.toUnicode(IDN.java:196)
at com.redhat.rhn.domain.server.Server.getDecodedHostname(Server.java:954)
at
com.redhat.rhn.frontend.action.systems.sdc.SystemHardwareAction.setupForm(SystemHardwareAction.java:132)
at
com.redhat.rhn.frontend.action.systems.sdc.SystemHardwareAction.execute(SystemHardwareAction.java:85)
at
org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:431)
at
org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:237)
at
com.redhat.rhn.frontend.struts.RhnRequestProcessor.process(RhnRequestProcessor.java:82)
at org.apache.struts.action.ActionServlet.process(ActionServlet.java:1196)
at org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:414)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:690)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:803)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:269)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at com.redhat.rhn.frontend.servlets.AuthFilter.doFilter(AuthFilter.java:101)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at
com.opensymphony.module.sitemesh.filter.PageFilter.parsePage(PageFilter.java:142)
at
com.opensymphony.module.sitemesh.filter.PageFilter.doFilter(PageFilter.java:58)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at
com.redhat.rhn.frontend.servlets.LocalizedEnvironmentFilter.doFilter(LocalizedEnvironmentFilter.java:67)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at
com.redhat.rhn.frontend.servlets.EnvironmentFilter.doFilter(EnvironmentFilter.java:108)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at
com.redhat.rhn.frontend.servlets.SessionFilter.doFilter(SessionFilter.java:55)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at
com.redhat.rhn.frontend.servlets.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:97)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:210)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:172)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:117)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:108)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:151)
at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:200)
at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291)
at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:775)
at
org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:704)
at
org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:897)
at
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:685)
at java.lang.Thread.run(Thread.java:636)
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java
b/java/code/src/com/redhat/rhn/domain/server/Server.java
index a9507c8..c923115 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -951,7 +951,8 @@ public class Server extends BaseDomainHelper implements Identifiable
{
* @return Returns the primary hostname for this server
*/
public String getDecodedHostname() {
- return IDN.toUnicode(getHostname());
+ String hostname = getHostname();
+ return (hostname == null) ? null : IDN.toUnicode(hostname);
}
/**