350642 Do not close SCEP during NIOBuffer manipulation

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3436 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -18,6 +18,7 @@ jetty-7.4.3-SNAPSHOT
  + 349997 MBeanContainer uses weak references
  + 350533 Add "Origin" to the list of allowed headers in CrossOriginFilter
  + 350634 Cleanup FileResource construction
+ + 350642 Don't close SCEP during NIOBuffer manipulation
  + JETTY-1342 Recreate selector in change task
  + JETTY-1390 RewriteHandler handles encoded URIs
 

jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java

@@ -154,32 +154,27 @@ public class ChannelEndPoint implements EndPoint
             final NIOBuffer nbuf = (NIOBuffer)buf;
             final ByteBuffer bbuf=nbuf.getByteBuffer();
             //noinspection SynchronizationOnLocalVariableOrMethodParameter
+            
+            try
+            {
                 synchronized(bbuf)
                 {
                     try
                     {
                         bbuf.position(buffer.putIndex());
                         len=_channel.read(bbuf);
+                    }
+                    finally
+                    {
+                        buffer.setPutIndex(bbuf.position());
+                        bbuf.position(0);
+                    }
+                }
+
                 if (len<0 && isOpen() && !isInputShutdown())
-                    {
-                        try
-                        {
                     shutdownInput();
             }
-                        catch(IOException x)
-                        {
-                            Log.ignore(x);
-                            try
-                            {
-                                close();
-                            }
-                            catch (IOException xx)
-                            {
-                                Log.ignore(xx);
-                            }
-                        }
-                    }
-                }
+
             catch (IOException x)
             {
                 try
@@ -192,12 +187,6 @@ public class ChannelEndPoint implements EndPoint
                 }
                 throw x;
             }
-                finally
-                {
-                    buffer.setPutIndex(bbuf.position());
-                    bbuf.position(0);
-                }
-            }
         }
         else
         {