From f2160f4bd1c8ac67e5a86a6710d431e8932877f9 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 28 May 2010 11:47:51 +0000
Subject: [PATCH] Synchronize SDK on java.net with internal repository.

---
 sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java |  227 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 132 insertions(+), 95 deletions(-)

diff --git a/sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java b/sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java
index 5a02dad..9bdf0ed 100644
--- a/sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java
+++ b/sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java
@@ -26,9 +26,13 @@
  */
 package com.sun.opends.sdk.util;
 
+
+
 import java.io.IOException;
 import java.io.InputStream;
 
+
+
 /**
  * An implementation of input stream that enforces an read size limit.
  */
@@ -36,8 +40,10 @@
 {
   private int bytesRead;
   private int markBytesRead;
-  private int readLimit;
-  private InputStream parentStream;
+  private final int readLimit;
+  private final InputStream parentStream;
+
+
 
   /**
    * Creates a new a new size limit input stream.
@@ -47,119 +53,39 @@
    * @param readLimit
    *          The size limit.
    */
-  public SizeLimitInputStream(InputStream parentStream, int readLimit)
+  public SizeLimitInputStream(final InputStream parentStream,
+      final int readLimit)
   {
     this.parentStream = parentStream;
     this.readLimit = readLimit;
   }
 
+
+
   /**
    * {@inheritDoc}
    */
+  @Override
   public int available() throws IOException
   {
-    int streamAvail = parentStream.available();
-    int limitedAvail = readLimit - bytesRead;
+    final int streamAvail = parentStream.available();
+    final int limitedAvail = readLimit - bytesRead;
     return limitedAvail < streamAvail ? limitedAvail : streamAvail;
   }
 
+
+
   /**
    * {@inheritDoc}
    */
-  public synchronized void mark(int readlimit)
+  @Override
+  public void close() throws IOException
   {
-    parentStream.mark(readlimit);
-    markBytesRead = bytesRead;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public int read() throws IOException
-  {
-    if(bytesRead >= readLimit)
-    {
-      return -1;
-    }
-
-    int b = parentStream.read();
-    if (b != -1)
-    {
-      ++bytesRead;
-    }
-    return b;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public int read(byte b[], int off, int len) throws IOException
-  {
-    if(off < 0 || len < 0 || off+len > b.length)
-    {
-      throw new IndexOutOfBoundsException();
-    }
-
-    if(len == 0)
-    {
-      return 0;
-    }
-
-    if(bytesRead >= readLimit)
-    {
-      return -1;
-    }
-
-    if(bytesRead + len > readLimit)
-    {
-      len = readLimit - bytesRead;
-    }
-
-    int readLen = parentStream.read(b, off, len);
-    if(readLen > 0)
-    {
-      bytesRead += readLen;
-    }
-    return readLen;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public synchronized void reset() throws IOException
-  {
-    parentStream.reset();
-    bytesRead = markBytesRead;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public long skip(long n) throws IOException
-  {
-    if(bytesRead + n > readLimit)
-    {
-      n = readLimit - bytesRead;
-    }
-
-    bytesRead += n;
-    return parentStream.skip(n);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public boolean markSupported() {
-    return parentStream.markSupported();
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public void close() throws IOException {
     parentStream.close();
   }
 
+
+
   /**
    * Retrieves the number of bytes read from this stream.
    *
@@ -170,6 +96,8 @@
     return bytesRead;
   }
 
+
+
   /**
    * Retrieves the size limit of this stream.
    *
@@ -179,4 +107,113 @@
   {
     return readLimit;
   }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public synchronized void mark(final int readlimit)
+  {
+    parentStream.mark(readlimit);
+    markBytesRead = bytesRead;
+  }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public boolean markSupported()
+  {
+    return parentStream.markSupported();
+  }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public int read() throws IOException
+  {
+    if (bytesRead >= readLimit)
+    {
+      return -1;
+    }
+
+    final int b = parentStream.read();
+    if (b != -1)
+    {
+      ++bytesRead;
+    }
+    return b;
+  }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public int read(final byte b[], final int off, int len) throws IOException
+  {
+    if (off < 0 || len < 0 || off + len > b.length)
+    {
+      throw new IndexOutOfBoundsException();
+    }
+
+    if (len == 0)
+    {
+      return 0;
+    }
+
+    if (bytesRead >= readLimit)
+    {
+      return -1;
+    }
+
+    if (bytesRead + len > readLimit)
+    {
+      len = readLimit - bytesRead;
+    }
+
+    final int readLen = parentStream.read(b, off, len);
+    if (readLen > 0)
+    {
+      bytesRead += readLen;
+    }
+    return readLen;
+  }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public synchronized void reset() throws IOException
+  {
+    parentStream.reset();
+    bytesRead = markBytesRead;
+  }
+
+
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public long skip(long n) throws IOException
+  {
+    if (bytesRead + n > readLimit)
+    {
+      n = readLimit - bytesRead;
+    }
+
+    bytesRead += n;
+    return parentStream.skip(n);
+  }
 }

--
Gitblit v1.10.0