From 37ea56ad11403666da664773d0e2bca0404a9dbb Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Mon, 30 May 2016 16:56:04 +1200
Subject: [PATCH] #724 - NPE when using L2 caching configured with @Cache with
 queryCaching=true and beanCaching=false

---
 .../ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 4706ae5c8..5ab077b3b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -620,6 +620,11 @@ final class BeanDescriptorCacheHelp<T> {
 
     queryCacheClear(changeSet);
 
+    if (beanCache == null) {
+      // query caching only
+      return;
+    }
+
     List<BeanPropertyAssocMany<?>> manyCollections = updateRequest.getUpdatedManyCollections();
     if (manyCollections != null) {
       for (int i = 0; i < manyCollections.size(); i++) {