java/code/src/com/redhat/rhn/frontend/action/kickstart/RenderKickstartFileAction.java |
4 +++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml |
7 +++++++
java/code/webapp/WEB-INF/struts-config.xml |
3 +++
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 53366661765ffef5a4edf3e24dbd8766066167f0
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Mar 31 16:44:23 2009 -0400
458838 - changing kickstart download 404s to have a descriptive message
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/RenderKickstartFileAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/RenderKickstartFileAction.java
index f314659..9f50bc5 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/RenderKickstartFileAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/RenderKickstartFileAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.kickstart;
import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.frontend.xmlrpc.NoSuchKickstartException;
import com.redhat.rhn.manager.kickstart.KickstartManager;
import org.apache.log4j.Logger;
@@ -66,7 +67,8 @@ public class RenderKickstartFileAction extends Action {
log.error("No kickstart filecontents found for: " + url +
" params: " + params + " ksdata: " +
ksdata);
// send 404 to the user since we don't have a kickstart profile
match
- response.sendError(HttpServletResponse.SC_NOT_FOUND);
+ //response.sendError(HttpServletResponse.SC_NOT_FOUND);
+ throw new NoSuchKickstartException();
}
if (log.isDebugEnabled()) {
log.debug("fileContents: " + fileContents);
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index a661dfe..6d00c09 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -21035,6 +21035,13 @@ given channel.</source>
<context
context-type="sourcefile">/rhn/systems/details/ErrataList.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="unknown.kickstart">
+ <source>Kickstart Not Found</source>
+ </trans-unit>
+ <trans-unit id="unknown.kickstart.message">
+ <source>The requested kickstart file could not be found.
+ If you are requesting an organizational default kickstart, ensure that a
kickstart has been selected as the "Organization Default".</source>
+ </trans-unit>
</body>
</file>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 243e45d..2caf809 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -995,6 +995,9 @@
<exception type="com.redhat.rhn.frontend.xmlrpc.NoSuchPackageException"
path="/WEB-INF/pages/common/errors/nosuchpkg.jsp" key="date"
handler="com.redhat.rhn.common.errors.NoSuchPackageExceptionHandler"/>
+ <exception
type="com.redhat.rhn.frontend.xmlrpc.NoSuchKickstartException"
+ path="/WEB-INF/pages/common/errors/nosuchkickstart.jsp"
key="date"
+
handler="com.redhat.rhn.common.errors.NoSuchKickstartExceptionHandler"/>
</global-exceptions>
<!--
Show replies by thread