You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/01/09 15:10:44 UTC
svn commit: r897457 - in /commons/proper/dbcp/trunk/doc:
BasicDataSourceExample.java JOCLPoolingDriverExample.java
ManualPoolingDataSourceExample.java ManualPoolingDriverExample.java
Author: sebb
Date: Sat Jan 9 14:10:43 2010
New Revision: 897457
URL: http://svn.apache.org/viewvc?rev=897457&view=rev
Log:
Fix possible NPEs
Modified:
commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java
commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java
commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java
commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java
Modified: commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java?rev=897457&r1=897456&r2=897457&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java (original)
+++ commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java Sat Jan 9 14:10:43 2010
@@ -104,9 +104,9 @@
} catch(SQLException e) {
e.printStackTrace();
} finally {
- try { rset.close(); } catch(Exception e) { }
- try { stmt.close(); } catch(Exception e) { }
- try { conn.close(); } catch(Exception e) { }
+ try { if (rset != null) rset.close(); } catch(Exception e) { }
+ try { if (stmt != null) stmt.close(); } catch(Exception e) { }
+ try { if (conn != null) conn.close(); } catch(Exception e) { }
}
}
Modified: commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java?rev=897457&r1=897456&r2=897457&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java (original)
+++ commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java Sat Jan 9 14:10:43 2010
@@ -111,9 +111,9 @@
} catch(SQLException e) {
e.printStackTrace();
} finally {
- try { rset.close(); } catch(Exception e) { }
- try { stmt.close(); } catch(Exception e) { }
- try { conn.close(); } catch(Exception e) { }
+ try { if (rset != null) rset.close(); } catch(Exception e) { }
+ try { if (stmt != null) stmt.close(); } catch(Exception e) { }
+ try { if (conn != null) conn.close(); } catch(Exception e) { }
}
}
}
Modified: commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java?rev=897457&r1=897456&r2=897457&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java (original)
+++ commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java Sat Jan 9 14:10:43 2010
@@ -127,9 +127,9 @@
} catch(SQLException e) {
e.printStackTrace();
} finally {
- try { rset.close(); } catch(Exception e) { }
- try { stmt.close(); } catch(Exception e) { }
- try { conn.close(); } catch(Exception e) { }
+ try { if (rset != null) rset.close(); } catch(Exception e) { }
+ try { if (stmt != null) stmt.close(); } catch(Exception e) { }
+ try { if (conn != null) conn.close(); } catch(Exception e) { }
}
}
Modified: commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java?rev=897457&r1=897456&r2=897457&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java (original)
+++ commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java Sat Jan 9 14:10:43 2010
@@ -129,9 +129,9 @@
} catch(SQLException e) {
e.printStackTrace();
} finally {
- try { rset.close(); } catch(Exception e) { }
- try { stmt.close(); } catch(Exception e) { }
- try { conn.close(); } catch(Exception e) { }
+ try { if (rset != null) rset.close(); } catch(Exception e) { }
+ try { if (stmt != null) stmt.close(); } catch(Exception e) { }
+ try { if (conn != null) conn.close(); } catch(Exception e) { }
}
// Display some pool statistics