You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by cm...@apache.org on 2002/02/25 18:22:54 UTC
cvs commit: jakarta-slide/src/stores/slidestore/reference/util JDBCAwareInputStream.java
cmlenz 02/02/25 09:22:54
Modified: src/stores/slidestore/reference/util
JDBCAwareInputStream.java
Log:
This was raising a NPE in my simple tests with HSQLDB, for some reason,
when copying or moving resources over the WebDAV interface.
I don't know much about what this class is all about, so if something's
wrong with the change, let me know.
Revision Changes Path
1.2 +9 -5 jakarta-slide/src/stores/slidestore/reference/util/JDBCAwareInputStream.java
Index: JDBCAwareInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/slidestore/reference/util/JDBCAwareInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCAwareInputStream.java 2 Jan 2002 21:16:48 -0000 1.1
+++ JDBCAwareInputStream.java 25 Feb 2002 17:22:54 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/util/JDBCAwareInputStream.java,v 1.1 2002/01/02 21:16:48 dirkv Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/02 21:16:48 $
+ * $Header: /home/cvs/jakarta-slide/src/stores/slidestore/reference/util/JDBCAwareInputStream.java,v 1.2 2002/02/25 17:22:54 cmlenz Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/25 17:22:54 $
*
* ====================================================================
*
@@ -64,6 +64,7 @@
package slidestore.reference.util;
import java.io.InputStream;
+import java.sql.ResultSet;
import java.sql.Statement;
import java.io.IOException;
@@ -73,7 +74,7 @@
* precious system resource - or at least Oracle cursors ;-)
*
* @author <a href="mailto:kimptoc@apache.org">Chris Kimpton</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JDBCAwareInputStream extends InputStream {
@@ -127,7 +128,10 @@
if (_relatedJDBCStatement != null) {
try {
_relatedJDBCStatement.close();
- _relatedJDBCStatement.getResultSet().close();
+ ResultSet rs = _relatedJDBCStatement.getResultSet();
+ if (rs != null) {
+ rs.close();
+ }
} catch (java.sql.SQLException sqle) {
throw new IOException(sqle.getMessage());
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>