Author: rich Date: Wed Jan 26 17:54:58 2005 New Revision: 126570 URL: http://svn.apache.org/viewcvs?view=rev&rev=126570 Log: - Changed to pass the thread context classloader to the initialization utility for Controls. - "Fixed" to avoid an NPE (or an assert, if asserts are enabled) when hitting a page flow whose Struts config file exists, but whose class file does not. - Removed a printStackTrace in UrlTemplateDescriptor.
DRT: netui (WinXP) BB: self (linux) Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?view=diff&rev=126570&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java&r1=126569&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java&r2=126570 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java Wed Jan 26 17:54:58 2005 @@ -551,6 +551,7 @@ catch ( ClassNotFoundException e ) { _log.error( "Could not find FlowController class " + flowControllerClassName, e ); + throw new ServletException( e ); } } else Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java?view=diff&rev=126570&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java&r1=126569&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java&r2=126570 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java Wed Jan 26 17:54:58 2005 @@ -30,8 +30,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.servlet.ServletContext; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Map; @@ -151,7 +149,7 @@ try { - Object instance = Controls.instantiate( null, controlClassName, properties, beanContext, controlID ); + Object instance = Controls.instantiate( Thread.currentThread().getContextClassLoader(), controlClassName, properties, beanContext, controlID ); assert instance instanceof ControlBean : instance.getClass().getName(); return ( ControlBean ) instance; } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java?view=diff&rev=126570&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java&r1=126569&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java&r2=126570 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java Wed Jan 26 17:54:58 2005 @@ -133,7 +133,6 @@ catch (Exception e) { // Bad descriptor _log.error("Exception while loading URL templates, " + DESCRIPTOR_PATH, e); - e.printStackTrace(); } _loaded = true;
