svn commit: r153103 - in incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal: AdapterManager.java DefaultForwardRedirectHandler.java

[rich]

Author: rich
Date: Wed Feb  9 10:44:28 2005
New Revision: 153103

URL: http://svn.apache.org/viewcvs?view=rev&rev=153103
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-266 : assertion error when 
redirecting from a page flow action

DRT: netui (WinXP)
BB: self (linux)


Modified:
    
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
    
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java?view=diff&r1=153102&r2=153103
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/AdapterManager.java
 Wed Feb  9 10:44:28 2005
@@ -44,7 +44,7 @@
         {
             if ( _log.isErrorEnabled() )
             {
-                _log.error( "ServletAdapter manager not initialized 
correctly." );
+                _log.error( "ServletContainerAdapter manager not initialized 
correctly." );
             }
             
             //

Modified: 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java?view=diff&r1=153102&r2=153103
==============================================================================
--- 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java
 Wed Feb  9 10:44:28 2005
@@ -50,7 +50,8 @@
     public void redirect( FlowControllerHandlerContext context, String uri )
         throws IOException, ServletException
     {
-        assert context.getRequest() instanceof HttpServletResponse : "don't 
support ServletResponse currently.";
+        assert context.getResponse() instanceof HttpServletResponse :
+                context.getResponse().getClass().getName() + " does not 
implement HttpServletResponse";
         HttpServletResponse response = ( HttpServletResponse ) 
context.getResponse();
         response.sendRedirect( response.encodeRedirectURL( uri ) );
     }
@@ -59,8 +60,10 @@
         throws IOException, ServletException
     {
         LegacySettings settings = LegacySettings.get( getServletContext() );
-        assert context.getRequest() instanceof HttpServletRequest : "don't 
support ServletRequest currently.";
-        assert context.getResponse() instanceof HttpServletResponse : "don't 
support ServletResponse currently.";
+        assert context.getRequest() instanceof HttpServletRequest :
+                context.getRequest().getClass().getName() + " does not 
implement HttpServletRequest";
+        assert context.getResponse() instanceof HttpServletResponse :
+                context.getResponse().getClass().getName() + " does not 
implement HttpServletResponse";
         HttpServletRequest request = ( HttpServletRequest ) 
context.getRequest();
         HttpServletResponse response = ( HttpServletResponse ) 
context.getResponse();
         int requestCount = RequestValues.getForwardedRequestCount( request );