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

Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2016/04/22 10:26:50 UTC

svn commit: r1740463 - /jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java

Author: amitj
Date: Fri Apr 22 08:26:50 2016
New Revision: 1740463

URL: http://svn.apache.org/viewvc?rev=1740463&view=rev
Log:
OAK-4269: Firebug warning: possible null-pointer dereference in S3Backend

Patch from Alfusainey Jallow

Modified:
    jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java

Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java?rev=1740463&r1=1740462&r2=1740463&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java Fri Apr 22 08:26:50 2016
@@ -340,7 +340,9 @@ public class S3Backend implements Shared
                 }
             });
         } catch (Exception e) {
-            callback.onAbort(new AsyncTouchResult(identifier));
+            if (callback != null) {
+                callback.onAbort(new AsyncTouchResult(identifier));
+            }
             throw new DataStoreException("Cannot touch the record "
                 + identifier.toString(), e);
         } finally {