rleland 2003/07/26 21:57:35
Modified: src/share/org/apache/struts/action ActionServlet.java
Log:
remove Unneeded test for null in finally block & cleanup javadoc a bit.
Revision Changes Path
1.164 +11 -12
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- ActionServlet.java 26 Jul 2003 04:21:06 -0000 1.163
+++ ActionServlet.java 27 Jul 2003 04:57:35 -0000 1.164
@@ -416,7 +416,7 @@
* Saves a String[] of module prefixes in the ServletContext under
* Globals.MODULE_PREFIXES_KEY. <strong>NOTE</strong> -
* the "" prefix for the default module is not included in this list.
- *
+ * @param context The servlet context.
* @since Struts 1.2
*/
protected void initModulePrefixes(ServletContext context) {
@@ -648,6 +648,7 @@
/**
* Returns the RequestProcessor for the given module or null if one does not
* exist. This method will not create a RequestProcessor.
+ * @param config The ModuleConfig.
*/
private RequestProcessor getProcessorForModule(ModuleConfig config) {
String key = Globals.REQUEST_PROCESSOR_KEY + config.getPrefix();
@@ -1129,13 +1130,11 @@
throw new ServletException(e);
} finally {
- if (input != null) {
- try {
- input.close();
- } catch (IOException e) {
- log.error(internal.getMessage("configWebXml"), e);
- throw new ServletException(e);
- }
+ try {
+ input.close();
+ } catch (IOException e) {
+ log.error(internal.getMessage("configWebXml"), e);
+ throw new ServletException(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
