diff --git a/src/java/org/apache/commons/collections/primitives/adapters/io/ByteIteratorInputStream.java b/src/java/org/apache/commons/collections/primitives/adapters/io/ByteIteratorInputStream.java
new file mode 100644
index 000000000..da2178069
--- /dev/null
+++ b/src/java/org/apache/commons/collections/primitives/adapters/io/ByteIteratorInputStream.java
@@ -0,0 +1,90 @@
+/*
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/adapters/io/Attic/ByteIteratorInputStream.java,v 1.1 2003/04/15 17:09:15 rwaldhoff Exp $
+ * ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.commons.collections.primitives.adapters.io;
+
+import java.io.InputStream;
+
+import org.apache.commons.collections.primitives.ByteIterator;
+
+/**
+ * Adapts an {@link ByteIterator} to the {@link InputStream} interface.
+ * 
+ * @version $Revision: 1.1 $ $Date: 2003/04/15 17:09:15 $
+ * @author Rodney Waldhoff
+ */
+public class ByteIteratorInputStream extends InputStream {
+
+    public ByteIteratorInputStream(ByteIterator in) {
+        this.iterator= in;
+    }
+
+    public int read() {
+        if(iterator.hasNext()) {
+            return (0xFF & iterator.next());
+        } else {
+            return -1;
+        }
+    }
+
+    public static InputStream adapt(ByteIterator in) {
+        return null == in ? null : new ByteIteratorInputStream(in);
+    }
+    
+    private ByteIterator iterator = null;
+
+}
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/io/TestAll.java b/src/test/org/apache/commons/collections/primitives/adapters/io/TestAll.java
index 11fdc1a4f..849b51fd2 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/io/TestAll.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/io/TestAll.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/io/Attic/TestAll.java,v 1.1 2003/04/15 03:07:49 rwaldhoff Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/io/Attic/TestAll.java,v 1.2 2003/04/15 17:09:14 rwaldhoff Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -62,7 +62,7 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 /**
- * @version $Revision: 1.1 $ $Date: 2003/04/15 03:07:49 $
+ * @version $Revision: 1.2 $ $Date: 2003/04/15 17:09:14 $
  * @author Rodney Waldhoff
  */
 public class TestAll extends TestCase {
@@ -74,6 +74,7 @@ public class TestAll extends TestCase {
         TestSuite suite = new TestSuite();
         
         suite.addTest(TestInputStreamByteIterator.suite());
+        suite.addTest(TestByteIteratorInputStream.suite());
 
         return suite;
     }
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/io/TestByteIteratorInputStream.java b/src/test/org/apache/commons/collections/primitives/adapters/io/TestByteIteratorInputStream.java
new file mode 100644
index 000000000..95bb4daa8
--- /dev/null
+++ b/src/test/org/apache/commons/collections/primitives/adapters/io/TestByteIteratorInputStream.java
@@ -0,0 +1,121 @@
+/*
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/io/Attic/TestByteIteratorInputStream.java,v 1.1 2003/04/15 17:09:14 rwaldhoff Exp $
+ * ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.commons.collections.primitives.adapters.io;
+
+import java.io.InputStream;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.commons.collections.primitives.ArrayByteList;
+import org.apache.commons.collections.primitives.ByteList;
+
+/**
+ * @version $Revision: 1.1 $ $Date: 2003/04/15 17:09:14 $
+ * @author Rodney Waldhoff
+ */
+public class TestByteIteratorInputStream extends TestCase {
+
+    // conventional
+    // ------------------------------------------------------------------------
+
+    public TestByteIteratorInputStream(String testName) {
+        super(testName);
+    }
+
+    public static Test suite() {
+        return new TestSuite(TestByteIteratorInputStream.class);
+    }
+
+    // ------------------------------------------------------------------------
+    
+
+
+    // ------------------------------------------------------------------------
+    
+    public void testReadNonEmpty() throws Exception {
+        ByteList list = new ArrayByteList();
+        for(int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++) {
+            list.add((byte)i);
+        }
+       
+        InputStream in = new ByteIteratorInputStream(list.iterator());
+        for(int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++) {
+            assertEquals(0xFF&i,in.read());
+        }
+        assertEquals(-1,in.read());
+        assertEquals(-1,in.read());
+    }
+
+    public void testReadEmpty() throws Exception {
+        ByteList list = new ArrayByteList();
+        InputStream in = new ByteIteratorInputStream(list.iterator());
+        assertEquals(-1,in.read());
+        assertEquals(-1,in.read());
+    }
+
+    public void testAdaptNull() {
+        assertNull(ByteIteratorInputStream.adapt(null));
+    }
+
+    public void testAdaptNonNull() {
+        assertNotNull(ByteIteratorInputStream.adapt(new ArrayByteList().iterator()));
+    }
+    
+}