From 9e3362d0040f2040168ebccf3006ab88f55f0f36 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Jun 2015 23:05:40 +1200
Subject: [PATCH] No effective change - tidy

---
 .../avaje/ebeaninternal/server/deploy/BeanDescriptor.java | 2 +-
 .../server/deploy/BeanDescriptorCacheHelp.java            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
index 7c4fe9dd2..6d677f920 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -631,7 +631,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo {
   }
 
   public boolean calculateUseCache(Boolean queryUseCache) {
-    return (queryUseCache != null) ? queryUseCache.booleanValue() : isBeanCaching();
+    return (queryUseCache != null) ? queryUseCache : isBeanCaching();
   }
 
   /**
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 4f8a19e49..222c659dc 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -303,7 +303,7 @@ public final class BeanDescriptorCacheHelp<T> {
     // try looking up into the bean cache using the id
     T cacheBean = beanCacheGetInternal(id, query.isReadOnly());
     if (cacheBean != null) {   
-      setupContext(cacheBean, query, getPersistenceContext(t));
+      setupContext(cacheBean, getPersistenceContext(t));
     }
     return cacheBean;  
   }
@@ -320,7 +320,7 @@ public final class BeanDescriptorCacheHelp<T> {
   }
 
   private boolean isNaturalKeyCaching(Boolean queryUseCache) {
-    return naturalKeyCache != null && (queryUseCache == null || queryUseCache.booleanValue());
+    return naturalKeyCache != null && (queryUseCache == null || queryUseCache);
   }
 
   private boolean isNaturalKey(String propName) {
@@ -332,7 +332,7 @@ public final class BeanDescriptorCacheHelp<T> {
   /**
    * For a bean built from the cache this sets up its persistence context for future lazy loading etc.
    */
-  private void setupContext(Object bean, SpiQuery<T> query, PersistenceContext context) {
+  private void setupContext(Object bean, PersistenceContext context) {
     if (context == null) {
       context = new DefaultPersistenceContext();
     }
@@ -408,7 +408,7 @@ public final class BeanDescriptorCacheHelp<T> {
   public T beanCacheGet(SpiQuery<T> query, PersistenceContext context) {
     T bean = beanCacheGetInternal(query.getId(), query.isReadOnly());
     if (bean != null) {
-      setupContext(bean, query, context);
+      setupContext(bean, context);
     }
     return bean;
   }