Potential fix for #190

Author: lincolnthree

config-prettyfaces/src/main/java/org/ocpsoft/rewrite/prettyfaces/PrettyFacesActionUrlProvider.java

@@ -16,8 +16,13 @@
 package org.ocpsoft.rewrite.prettyfaces;
 
 import javax.faces.context.FacesContext;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
 
+import org.ocpsoft.common.services.ServiceLoader;
 import org.ocpsoft.rewrite.faces.spi.FacesActionUrlProvider;
+import org.ocpsoft.rewrite.servlet.DispatcherType;
+import org.ocpsoft.rewrite.servlet.spi.DispatcherTypeProvider;
 
 import com.ocpsoft.pretty.PrettyContext;
 import com.ocpsoft.pretty.faces.beans.ExtractedValuesURLBuilder;
@@ -28,7 +33,27 @@
  */
 public class PrettyFacesActionUrlProvider implements FacesActionUrlProvider
 {
-   public String getActionURL(final FacesContext context, final String viewId)
+   @SuppressWarnings("unchecked")
+   private final Iterable<DispatcherTypeProvider> providers = ServiceLoader.load(DispatcherTypeProvider.class);
+
+   @Override
+   public String getActionURL(FacesContext context, String viewId)
+   {
+      HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest();
+
+      for (DispatcherTypeProvider provider : providers)
+      {
+         DispatcherType type = provider.getDispatcherType(request, (ServletContext) FacesContext
+                  .getCurrentInstance().getExternalContext().getContext());
+
+         if (type == null || type != DispatcherType.ERROR) {
+            return _getActionURL(context, viewId);
+         }
+      }
+      return null;
+   }
+
+   public String _getActionURL(final FacesContext context, final String viewId)
    {
       PrettyContext prettyContext = PrettyContext.getCurrentInstance(context);
       String result = null;

impl-servlet-2.5/src/main/java/org/ocpsoft/rewrite/servlet/impl/Servlet25DispatcherTypeProvider.java

@@ -42,11 +42,17 @@ public DispatcherType getDispatcherType(ServletRequest request, ServletContext c
       if (request.getAttribute("javax.servlet.forward.request_uri") != null) {
          return DispatcherType.FORWARD;
       }
+
       if (request.getAttribute("javax.servlet.include.request_uri") != null) {
          return DispatcherType.INCLUDE;
       }
-      return DispatcherType.REQUEST;
 
+      Throwable throwable = (Throwable) request.getAttribute("javax.servlet.error.exception");
+      if (throwable != null) {
+         return DispatcherType.ERROR;
+      }
+
+      return DispatcherType.REQUEST;
    }
 
 }