Author: pbenedict
Date: Thu Aug 23 21:10:12 2007
New Revision: 569239
URL: http://svn.apache.org/viewvc?rev=569239&view=rev
Log:
STR-3085: Swallow NPE and return null
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java?rev=569239&r1=569238&r2=569239&view=diff
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
Thu Aug 23 21:10:12 2007
@@ -1957,8 +1957,12 @@
* @return the array of plugins or <code>null</code>
*/
private PlugIn[] getModulePlugIns(ModuleConfig moduleConfig) {
- String plugInKey = Globals.PLUG_INS_KEY + moduleConfig.getPrefix();
- return (PlugIn[]) getServletContext().getAttribute(plugInKey);
+ try {
+ String plugInKey = Globals.PLUG_INS_KEY +
moduleConfig.getPrefix();
+ return (PlugIn[]) getServletContext().getAttribute(plugInKey);
+ } catch (NullPointerException e) {
+ return null;
+ }
}
/**
