----------------------------------------------------------------
BEFORE YOU POST, search the faq at <http://java.apache.org/faq/>
WHEN YOU POST, include all relevant version numbers, log files,
and configuration files. Don't make us guess your problem!!!
----------------------------------------------------------------
Try this, I don't normally use CVS so it took me a while to learn the
commands...
Our systems also seem to disagree on white space in some cases.
cvs -q diff JServConnection.java (in directory
D:\CVS_JServ\jserv\src\java\org\apache\jserv)
Index: JServConnection.java
===================================================================
RCS file:
/products/cvs/master/jserv/src/java/org/apache/jserv/JServConnection.java,v
retrieving revision 1.71
diff -r1.71 JServConnection.java
1666c1666
<
---
>
1668,1669c1668,1669
< protected int length;
<
---
> protected int length;
>
1671c1671
< this.length = length;
---
> this.length = length;
1674,1678c1674,1684
<
< public int read() throws IOException {
< if ((length-- > 0) || (length == -1))
< return in.read();
< return -1;
---
>
> public int read() throws IOException
> if (length == -1)
> return in.read();
>
> if ((length > 0) || (length == -1)) {
> int i = in.read();
> length -= i;
> return i;
> }
> return -1;
1680c1686
<
---
>
1682,1691c1688,1699
< if (length == -1)
< return in.read(b, 0, b.length);
<
< int len = b.length;
< if (len > length)
< len = length;
< length -= len;
< if (len > 0)
< return in.read(b, 0, len);
< return 0;
---
> if (length == -1)
> return in.read(b, 0, b.length);
>
> int len = b.length;
> if (len > length)
> len = length;
> if (len > 0) {
> int i = in.read(b, 0, len);
> length -= i;
> return i;
> }
> return 0;
1693c1701
<
---
>
1695,1703c1703,1713
< if (length == -1)
< return in.read(b, off, len);
<
< if (len > length)
< len = length;
< length -= len;
< if (len > 0)
< return in.read(b,off,len);
< return 0;
---
> if (length == -1)
> return in.read(b, off, len);
>
> if (len > length)
> len = length;
> if (len > 0) {
> int i = in.read(b,off,len);
> length -= i;
> return i;
> }
> return 0;
1705c1715
<
---
>
1707,1715c1717,1727
< if (length == -1)
< return in.skip(n);
<
< if (n > length)
< n = length;
< length -= n;
< if (n > 0)
< return in.skip(n);
< return 0;
---
> if (length == -1)
> return in.skip(n);
>
> if (n > length)
> n = length;
> if (n > 0) {
> long i = in.skip(n);
> length -= i;
> return i;
> }
> return 0;
1717c1729
<
---
>
1723c1735
<
---
>
1730,1731c1742,1743
< if (length == -1)
< return in.available();
---
> if (length == -1)
> return in.available();
1733a1746
>
*****CVS exited normally with code 1*****
Jon Smirl
[EMAIL PROTECTED]
--
--------------------------------------------------------------
Please read the FAQ! <http://java.apache.org/faq/>
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Archives and Other: <http://java.apache.org/main/mail.html>
Problems?: [EMAIL PROTECTED]
