dims 01/08/20 10:20:26
Modified: src/org/apache/cocoon/transformation Tag: cocoon_20_branch
SQLTransformer.java
Log:
Patch from [EMAIL PROTECTED] for "SQLTransformer: the last one?"
Revision Changes Path
No revision
No revision
1.5.2.10 +11 -5
xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -u -r1.5.2.9 -r1.5.2.10
--- SQLTransformer.java 2001/08/20 14:07:34 1.5.2.9
+++ SQLTransformer.java 2001/08/20 17:20:26 1.5.2.10
@@ -51,7 +51,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:[EMAIL PROTECTED]";>Sven Beauprez</a>
- * @version CVS $Revision: 1.5.2.9 $ $Date: 2001/08/20 14:07:34 $ $Author: dims $
+ * @version CVS $Revision: 1.5.2.10 $ $Date: 2001/08/20 17:20:26 $ $Author: dims $
*/
public class SQLTransformer extends AbstractTransformer implements Composable,
Recyclable, Disposable, Configurable {
@@ -931,9 +931,14 @@
// happened (see JDBC docs - return codes for executeUpdate)
if (rv != -1)
return true;
- if (rs == null || !rs.next()) {
- close();
- return false;
+ try {
+ if (rs == null || !rs.next()) {
+ //close();
+ return false;
+ }
+ } catch (NullPointerException e) {
+ getTheLogger().debug("NullPointerException, returning false.", e);
+ return false;
}
return true;
}
@@ -1016,6 +1021,7 @@
}
}finally{
rs.close();
+ rs = null;
}
transformer.end((String)outParametersNames.get(counter));
}
@@ -1025,7 +1031,7 @@
}
}
} finally {
- close();
+ //close();
}
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
