binary stream patch by Kris Jurka fixes empty stream failure

Dave Cramer · Dave Cramer · commit 4bb71ef5194c · 2003-12-12T00:26:20.000Z
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
@@ -26,7 +26,7 @@
 import java.sql.Types;
 import java.util.Vector;
 
-/* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java,v 1.42 2003/11/29 19:52:10 pgsql Exp $
+/* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java,v 1.43 2003/12/12 00:26:20 davec Exp $
  * This class defines methods of the jdbc1 specification.  This class is
  * extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2
  * methods.  The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement
@@ -1479,6 +1479,11 @@ public void setBinaryStream(int parameterIndex, InputStream x, int length) throw
 			{
 				setBytes(parameterIndex, l_bytes);
 			}
+			// x.read will return -1 not 0 on an empty InputStream
+			else if (l_bytesRead == -1)
+			{
+				setBytes(parameterIndex, new byte[0]);
+			}
 			else
 			{
 				//the stream contained less data than they said

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`import java.sql.Types;`
`27`	`27`	`import java.util.Vector;`
`28`	`28`
`29`		`-/* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java,v 1.42 2003/11/29 19:52:10 pgsql Exp $`
	`29`	`+/* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java,v 1.43 2003/12/12 00:26:20 davec Exp $`
`30`	`30`	`* This class defines methods of the jdbc1 specification. This class is`
`31`	`31`	`* extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2`
`32`	`32`	`* methods. The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement`
`@@ -1479,6 +1479,11 @@ public void setBinaryStream(int parameterIndex, InputStream x, int length) throw`
`1479`	`1479`	`{`
`1480`	`1480`	`setBytes(parameterIndex, l_bytes);`
`1481`	`1481`	`}`
	`1482`	`+ // x.read will return -1 not 0 on an empty InputStream`
	`1483`	`+ else if (l_bytesRead == -1)`
	`1484`	`+ {`
	`1485`	`+ setBytes(parameterIndex, new byte[0]);`
	`1486`	`+ }`
`1482`	`1487`	`else`
`1483`	`1488`	`{`
`1484`	`1489`	`//the stream contained less data than they said`