svn commit: r1596875 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

[mreutegg]

Author: mreutegg
Date: Thu May 22 14:01:22 2014
New Revision: 1596875

URL: http://svn.apache.org/r1596875
Log:
OAK-1853: Potential NPE in RDBDocumentStore

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1596875&r1=1596874&r2=1596875&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
 Thu May 22 14:01:22 2014
@@ -656,7 +656,9 @@ public class RDBDocumentStore implements
             return success;
         } catch (SQLException ex) {
             try {
-                connection.rollback();
+                if (connection != null) {
+                    connection.rollback();
+                }
             } catch (SQLException e) {
                 // TODO
             }
@@ -681,7 +683,9 @@ public class RDBDocumentStore implements
         } catch (SQLException ex) {
             LOG.debug("insert of " + document.getId() + " failed", ex);
             try {
-                connection.rollback();
+                if (connection != null) {
+                    connection.rollback();
+                }
             } catch (SQLException e) {
                 // TODO
             }