svn commit: r373827 - /myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java

[mm...@apache.org]

Author: mmarinschek
Date: Tue Jan 31 06:50:35 2006
New Revision: 373827

URL: http://svn.apache.org/viewcvs?rev=373827&view=rev
Log:
special javascript was rendered even if null

Modified:
    myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java

Modified: myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java?rev=373827&r1=373826&r2=373827&view=diff
==============================================================================
--- myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java (original)
+++ myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/util/AddResource.java Tue Jan 31 06:50:35 2006
@@ -677,7 +677,7 @@
      * Parses the response to mark the positions where code will be inserted
      */
     public void parseResponse(HttpServletRequest request, String bufferedResponse,
-            HttpServletResponse response) throws IOException
+            HttpServletResponse response)
     {
 
         originalResponse = new StringBuffer(bufferedResponse);
@@ -705,13 +705,18 @@
             throw new IOException("Method parseResponse has to be called first");
          }
 
-        ResponseWriter writer = new HtmlResponseWriterImpl(response.getWriter(), HtmlRendererUtils
-                .selectContentType(request.getHeader("accept")), null);
-
         if (beforeBodyEndPosition >= 0)
         {
             String myFacesJavascript = (String) request.getAttribute("org.apache.myfaces.myFacesJavascript");
-            originalResponse.insert(beforeBodyEndPosition, myFacesJavascript);
+
+            if(myFacesJavascript != null)
+            {
+                originalResponse.insert(beforeBodyEndPosition, myFacesJavascript);
+            }
+            else
+            {
+                log.warn("MyFaces special javascript could not be retrieved from request-map.");
+            }
         }
     }