diff --git a/Frameworks/Core/ERExtensions/Sources/com/webobjects/jspservlet/_WOApplicationWrapper.java b/Frameworks/Core/ERExtensions/Sources/com/webobjects/jspservlet/_WOApplicationWrapper.java
index 24423a452f9..1c35884d6b8 100644
--- a/Frameworks/Core/ERExtensions/Sources/com/webobjects/jspservlet/_WOApplicationWrapper.java
+++ b/Frameworks/Core/ERExtensions/Sources/com/webobjects/jspservlet/_WOApplicationWrapper.java
@@ -1,18 +1,5 @@
 package com.webobjects.jspservlet;
 
-import com.webobjects.appserver.WOApplication;
-import com.webobjects.appserver.WODynamicURL;
-import com.webobjects.appserver.WORequest;
-import com.webobjects.appserver.WOResponse;
-import com.webobjects.appserver._private.WOInputStreamData;
-import com.webobjects.appserver._private.WONoCopyPushbackInputStream;
-import com.webobjects.foundation.NSArray;
-import com.webobjects.foundation.NSData;
-import com.webobjects.foundation.NSDelayedCallbackCenter;
-import com.webobjects.foundation.NSLog;
-import com.webobjects.foundation.NSLog.Logger;
-import com.webobjects.foundation.NSMutableDictionary;
-import com.webobjects.foundation.NSMutableRange;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,12 +9,25 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.webobjects.appserver.WOApplication;
+import com.webobjects.appserver.WODynamicURL;
+import com.webobjects.appserver.WORequest;
+import com.webobjects.appserver.WOResponse;
+import com.webobjects.appserver._private.WOInputStreamData;
+import com.webobjects.appserver._private.WONoCopyPushbackInputStream;
+import com.webobjects.foundation.NSArray;
+import com.webobjects.foundation.NSData;
+import com.webobjects.foundation.NSDelayedCallbackCenter;
+import com.webobjects.foundation.NSLog;
+import com.webobjects.foundation.NSMutableDictionary;
+import com.webobjects.foundation.NSMutableRange;
+
 /**
  * Fixes a bug in servletDispatchRequest() that manifests when a WOResponse
  * uses a content stream rather than an NSData.
@@ -95,7 +95,7 @@ public void servletDispatchRequest(Map<String, Object> userInfo, boolean isDeplo
 
     Map<String, Object> ourUserInfo = new HashMap(userInfo.size());
     for (Iterator<String> mapEnum = userInfo.keySet().iterator(); mapEnum.hasNext();) {
-      String key = (String)mapEnum.next();
+      String key = mapEnum.next();
       ourUserInfo.put(key, userInfo.get(key));
     }
     
@@ -180,7 +180,8 @@ public void servletDispatchRequest(Map<String, Object> userInfo, boolean isDeplo
       
       if (is == null) {
         NSMutableRange range = new NSMutableRange();
-        byte[] contentBytesNoCopy = ourContent.bytesNoCopy(range);
+        @SuppressWarnings("null") // as neither ourContent and is may be null
+		byte[] contentBytesNoCopy = ourContent.bytesNoCopy(range);
         out.write(contentBytesNoCopy, range.location(), range.length());
       } else {
         try {
@@ -240,8 +241,8 @@ public void servletDispatchRequest(Map<String, Object> userInfo, boolean isDeplo
     Iterator<String> mapEnum;
     if (extraHeaders != null) {
       for (mapEnum = extraHeaders.keySet().iterator(); mapEnum.hasNext();) {
-        String key = (String)mapEnum.next();
-        List<String> value = (List)extraHeaders.get(key);
+        String key = mapEnum.next();
+        List<String> value = extraHeaders.get(key);
         if (value == null) {
           headers.remove(key.toLowerCase());
         } else {
@@ -269,15 +270,15 @@ public void servletDispatchRequest(Map<String, Object> userInfo, boolean isDeplo
   }
   
   private static void _mergeHeaders(WOResponse woResponse, HttpServletResponse servletResponse) {
-    for (Iterator iterator = woResponse.headerKeys().iterator(); iterator.hasNext();) { String key = (String)iterator.next();
-      String lowercaseKey = key.toLowerCase();
-      if (!"content-length".equals(lowercaseKey)) {
-        for (String value : woResponse.headersForKey(lowercaseKey)) {
-          servletResponse.addHeader(key, value);
-        }
-      }
-    }
-    String key;
+	  for (Iterator iterator = woResponse.headerKeys().iterator(); iterator.hasNext();) { 
+		  String key = (String)iterator.next();
+		  String lowercaseKey = key.toLowerCase();
+		  if (!"content-length".equals(lowercaseKey)) {
+			  for (String value : woResponse.headersForKey(lowercaseKey)) {
+				  servletResponse.addHeader(key, value);
+			  }
+		  }
+	  }
   }
   
   public String servletResponseForComponentWithName(String name, Map<String, Object> bindings, Map<String, ? extends List<String>> extraHeaders, Map<String, Object> userInfo, String urlPrefix, String appName, boolean mergeResponseHeaders, boolean isDeployed)