From 6473bbc2b69bdff71c9579c0355c7324b56e1319 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Fri, 13 Dec 2013 14:27:13 +0100
Subject: [PATCH] 424014 - PathContentProvider does not close its internal
 SeekableByteChannel.

Fixed by closing the channel when it has been fully read and in case
of exceptions.
---
 .../client/util/PathContentProvider.java      | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java
index 2aa87e93a6d..379599676e9 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java
@@ -30,6 +30,8 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import org.eclipse.jetty.client.api.ContentProvider;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
 
 /**
  * A {@link ContentProvider} for files using JDK 7's {@code java.nio.file} APIs.
@@ -39,6 +41,8 @@ import org.eclipse.jetty.client.api.ContentProvider;
  */
 public class PathContentProvider implements ContentProvider
 {
+    private static final Logger LOG = Log.getLogger(PathContentProvider.class);
+
     private final Path filePath;
     private final long fileSize;
     private final int bufferSize;
@@ -86,19 +90,35 @@ public class PathContentProvider implements ContentProvider
                 try
                 {
                     if (channel == null)
+                    {
                         channel = Files.newByteChannel(filePath, StandardOpenOption.READ);
+                        LOG.debug("Opened file {}", filePath);
+                    }
 
                     buffer.clear();
                     int read = channel.read(buffer);
                     if (read < 0)
                         throw new NoSuchElementException();
 
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("Read {} bytes from {}", read, filePath);
+
                     position += read;
+
+                    if (!hasNext())
+                        close();
+
                     buffer.flip();
                     return buffer;
                 }
-                catch (IOException x)
+                catch (NoSuchElementException x)
                 {
+                    close();
+                    throw x;
+                }
+                catch (Exception x)
+                {
+                    close();
                     throw (NoSuchElementException)new NoSuchElementException().initCause(x);
                 }
             }
@@ -108,6 +128,19 @@ public class PathContentProvider implements ContentProvider
             {
                 throw new UnsupportedOperationException();
             }
+
+            private void close()
+            {
+                try
+                {
+                    if (channel != null)
+                        channel.close();
+                }
+                catch (Exception x)
+                {
+                    LOG.ignore(x);
+                }
+            }
         };
     }
 }