You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/03/29 00:35:41 UTC

svn commit: r523484 - /incubator/servicemix/branches/servicemix-3.1/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java

Author: gnodet
Date: Wed Mar 28 15:35:40 2007
New Revision: 523484

URL: http://svn.apache.org/viewvc?view=rev&rev=523484
Log:
Avoid possible NPE (even if catched)

Modified:
    incubator/servicemix/branches/servicemix-3.1/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java

Modified: incubator/servicemix/branches/servicemix-3.1/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java?view=diff&rev=523484&r1=523483&r2=523484
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java (original)
+++ incubator/servicemix/branches/servicemix-3.1/core/servicemix-services/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java Wed Mar 28 15:35:40 2007
@@ -204,14 +204,18 @@
     
     static private void close(Statement s) {
         try {
-            s.close();
+            if (s != null) {
+                s.close();
+            }
         } catch (Throwable e) {
         }
     }
 
     static private void close(ResultSet rs) {
         try {
-            rs.close();
+            if (rs != null) {
+                rs.close();
+            }
         } catch (Throwable e) {
         }
     }