You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2002/05/27 16:42:47 UTC
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr AprInputStream.java AprOutputStream.java
glenn 02/05/27 07:42:47
Modified: jk/java/org/apache/jk/apr AprInputStream.java
AprOutputStream.java
Log:
Method signatures for APR no longer matched which broke the build.
Updated the method signatures to match Costin's latest changes.
Revision Changes Path
1.2 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprInputStream.java
Index: AprInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AprInputStream.java 12 Jan 2002 04:00:15 -0000 1.1
+++ AprInputStream.java 27 May 2002 14:42:47 -0000 1.2
@@ -96,7 +96,7 @@
public int read() throws IOException {
byte buf [] = new byte[1];
- if ( apr.unRead( pool, fd, buf, 0, 1) < 0)
+ if ( apr.unRead( fd, buf, 0, 1) < 0)
throw new IOException();
return 0xff & buf[0];
}
1.2 +2 -2 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprOutputStream.java
Index: AprOutputStream.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprOutputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AprOutputStream.java 12 Jan 2002 04:00:15 -0000 1.1
+++ AprOutputStream.java 27 May 2002 14:42:47 -0000 1.2
@@ -100,12 +100,12 @@
// based on type select the native write method
// Or separate classes for each type - but we expect UNIX
// sockets to be integrated in apr
- if ( apr.unWrite( pool, fd, buf, 0, 1 ) < 0)
+ if ( apr.unWrite( fd, buf, 0, 1 ) < 0)
throw new IOException();
}
public void write(byte b[], int off, int len) throws IOException {
- if ( apr.unWrite( pool, fd, b, off, len ) < 0)
+ if ( apr.unWrite( fd, b, off, len ) < 0)
throw new IOException();
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>