Author: mrdon
Date: Sat Dec 31 00:57:16 2005
New Revision: 360262
URL: http://svn.apache.org/viewcvs?rev=360262&view=rev
Log:
Fixing NPE when extending an action mapping that contains wildcards.
Since the wildcard matcher is only created on a freeze, the call to
findActionConfigs at construction time threw the NPE.
Modified:
struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java
Modified:
struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java?rev=360262&r1=360261&r2=360262&view=diff
==============================================================================
---
struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java
(original)
+++
struts/action/trunk/src/java/org/apache/struts/config/impl/ModuleConfigImpl.java
Sat Dec 31 00:57:16 2005
@@ -315,8 +315,8 @@
ActionConfig config = (ActionConfig) actionConfigs.get(path);
// If a direct match cannot be found, try to match action configs
- // containing wildcard patterns
- if (config == null) {
+ // containing wildcard patterns only if a matcher exists.
+ if (config == null && matcher != null) {
config = matcher.match(path);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
