You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by mm...@apache.org on 2006/02/12 18:13:23 UTC

svn commit: r377207 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java

Author: mmarinschek
Date: Sun Feb 12 09:13:19 2006
New Revision: 377207

URL: http://svn.apache.org/viewcvs?rev=377207&view=rev
Log:
fixed problem with RI in phase-listener, expanded DateTimeConverterTest

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java?rev=377207&r1=377206&r2=377207&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java Sun Feb 12 09:13:19 2006
@@ -109,7 +109,10 @@
             JavascriptUtils.renderAutoScrollFunction(facesContext, writerWrapper);
         }
 
-        facesContext.setResponseWriter(responseWriter);
+        //todo: this is just a quick-fix - Sun RI screams if the old responsewriter is null
+        //but how to reset the old response-writer then?
+        if(responseWriter!=null)
+            facesContext.setResponseWriter(responseWriter);
 
         facesContext.getExternalContext().getRequestMap().put(ORG_APACHE_MYFACES_MY_FACES_JAVASCRIPT, "<!-- MYFACES JAVASCRIPT -->\n"+writerWrapper.toString()+"\n");
     }