You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/09/08 21:57:35 UTC

svn commit: r279608 - /beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java

Author: ekoneil
Date: Thu Sep  8 12:57:33 2005
New Revision: 279608

URL: http://svn.apache.org/viewcvs?rev=279608&view=rev
Log:
Fix an NPE that occurred when no action interceptors were defined in the XML config file.

Oops.  :)

BB: self
DRT: NetUI pass


Modified:
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java?rev=279608&r1=279607&r2=279608&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/internal/XmlBeanConfigFactory.java Thu Sep  8 12:57:33 2005
@@ -248,9 +248,14 @@
         }
 
         /* RequestInterceptorsConfig */
-        InterceptorConfig[] requestInterceptorConfig =
-            parseInterceptorConfig(xmlbean.getRequestInterceptors().getGlobal().getRequestInterceptorArray());
-        RequestInterceptorsConfig requestInterceptorsConfig = new RequestInterceptorsConfig(requestInterceptorConfig);
+        RequestInterceptorsConfig requestInterceptorsConfig = null;
+        if(xmlbean.getRequestInterceptors() != null &&
+           xmlbean.getRequestInterceptors().getGlobal() != null &&
+           xmlbean.getRequestInterceptors().getGlobal().getRequestInterceptorArray() != null) {
+            InterceptorConfig[] requestInterceptorConfig = null;
+            requestInterceptorConfig = parseInterceptorConfig(xmlbean.getRequestInterceptors().getGlobal().getRequestInterceptorArray());
+            requestInterceptorsConfig = new RequestInterceptorsConfig(requestInterceptorConfig);
+        }
 
         /* PrefixHandlerConfig */
         PrefixHandlerConfig[] prefixHandlers = null;