From 28cabf00eefe262c9af3293136843f3c480c3d80 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 9 Jan 2018 15:27:49 +0100
Subject: [PATCH] CachingOmemoStore: check for nullity of wrapped store

---
 .../smackx/omemo/signal/SignalCachingOmemoStore.java           | 2 +-
 .../java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalCachingOmemoStore.java b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalCachingOmemoStore.java
index cfadac46e..b70ee2409 100644
--- a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalCachingOmemoStore.java
+++ b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalCachingOmemoStore.java
@@ -45,7 +45,7 @@ public class SignalCachingOmemoStore extends CachingOmemoStore<IdentityKeyPair,
     /**
      * Create a new SignalCachingOmemoStore as a caching layer around a persisting OmemoStore
      * (eg. a SignalFileBasedOmemoStore).
-     * @param wrappedStore
+     * @param wrappedStore other store implementation that gets wrapped
      */
     public SignalCachingOmemoStore(OmemoStore<IdentityKeyPair, IdentityKey, PreKeyRecord, SignedPreKeyRecord,
             SessionRecord, SignalProtocolAddress, ECPublicKey, PreKeyBundle, SessionCipher> wrappedStore)
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java
index 944db6eb4..cc1c06250 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/CachingOmemoStore.java
@@ -63,6 +63,9 @@ public class CachingOmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Se
     }
 
     public CachingOmemoStore(OmemoStore<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Sess, T_Addr, T_ECPub, T_Bundle, T_Ciph> wrappedStore) {
+        if (wrappedStore == null) {
+            throw new NullPointerException("Wrapped OmemoStore MUST NOT be null!");
+        }
         this.keyUtil = null;
         persistent = wrappedStore;
     }