Author: craigmcc
Date: Fri Dec 15 19:06:47 2006
New Revision: 487750

URL: http://svn.apache.org/viewvc?view=rev&rev=487750
Log:
If someone has already called FacesContext.responseComplete() on this request,
there is nothing for us to do so just return.

SHALE-360

Modified:
    
shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/AbstractResourceProcessor.java
    
shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/MethodBindingProcessor.java

Modified: 
shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/AbstractResourceProcessor.java
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/AbstractResourceProcessor.java?view=diff&rev=487750&r1=487749&r2=487750
==============================================================================
--- 
shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/AbstractResourceProcessor.java
 (original)
+++ 
shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/AbstractResourceProcessor.java
 Fri Dec 15 19:06:47 2006
@@ -83,6 +83,12 @@
             throw new IllegalArgumentException(resourceId);
         }
 
+        // If someone else has completed the response, we do not have
+        // anything to do
+        if (context.getResponseComplete()) {
+            return;
+        }
+
         // Filter based on our includes and excludes patterns
         if (!accept(resourceId)) {
             if (log().isTraceEnabled()) {

Modified: 
shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/MethodBindingProcessor.java
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/MethodBindingProcessor.java?view=diff&rev=487750&r1=487749&r2=487750
==============================================================================
--- 
shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/MethodBindingProcessor.java
 (original)
+++ 
shale/framework/trunk/shale-remoting/src/main/java/org/apache/shale/remoting/impl/MethodBindingProcessor.java
 Fri Dec 15 19:06:47 2006
@@ -92,6 +92,12 @@
      */
     public void process(FacesContext context, String resourceId) throws 
IOException {
 
+        // If someone else has completed the response, we do not have
+        // anything to do
+        if (context.getResponseComplete()) {
+            return;
+        }
+
         // Filter based on our includes and excludes patterns
         if (!accept(resourceId)) {
             if (log().isTraceEnabled()) {


Reply via email to