==== java/org/apache/tomcat/util/net/AprEndpoint.java#7 - java/org/apache/tomcat/util/net/AprEndpoint.java ====
@@ -1715,7 +1748,7 @@
             if (rv == Status.APR_SUCCESS) {
                 sendfileCount--;
             }
-            sendfileData.remove(data);
+            sendfileData.remove(new Long(data.socket));
         }
 
         /**