svn commit: r1859716 - /jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java

[reschke]

Author: reschke
Date: Wed May 22 11:37:34 2019
New Revision: 1859716

URL: http://svn.apache.org/viewvc?rev=1859716&view=rev
Log:
OAK-8338: RDBDocumentStoreJDBC: fix theoretically possible NPE in perflogging 
code

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

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1859716&r1=1859715&r2=1859716&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
 Wed May 22 11:37:34 2019
@@ -478,7 +478,7 @@ public class RDBDocumentStoreJDBC {
                 byte[] bdata = rs.getBytes(field++);
                 result.add(new RDBRow(id, hasBinary, deletedOnce, modified, 
modcount, cmodcount, schemaVersion, sdType,
                         sdMaxRevTime, data, bdata));
-                dataTotal += data.length();
+                dataTotal += data == null ? 0 : data.length();
                 bdataTotal += bdata == null ? 0 : bdata.length;
                 PERFLOG.end(pstart, 10, "queried: table={} -> id={}, 
modcount={}, modified={}, data={}, bdata={}", tmd.getName(), id,
                         modcount, modified, (data == null ? 0 : 
data.length()), (bdata == null ? 0 : bdata.length));