X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/431824dc73735c967b47b2f462d168ba4118999f..02a47bbb7c083f9f903167b0274f037dfbf2e16d:/cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CacheLoader.java

diff --git a/cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CacheLoader.java b/cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CacheLoader.java
index 7f352a7986..99e8d586a8 100644
--- a/cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CacheLoader.java
+++ b/cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CacheLoader.java
@@ -381,7 +381,7 @@ public class CacheLoader {
             Object cachedo = field.get(cachedCdmEntity);
             CdmBase cdmEntityInSubGraph = null;
 
-            if(update || ProxyUtils.isProxy(cachedo)) {
+            if(!ProxyUtils.isUninitializedProxy(o) && (update || ProxyUtils.isUninitializedProxy(cachedo))) {
                 // if we are in update mode we have to make the field of the cached entity
                 // up-to-date by setting it to the value of the cdm entity being loaded
                 //
@@ -394,7 +394,7 @@ public class CacheLoader {
 
             }
 
-            if(o != null && !ProxyUtils.isProxy(o)) {
+            if(o != null && !ProxyUtils.isUninitializedProxy(o)) {
                 if(CdmBase.class.isAssignableFrom(o.getClass())) {
                     logger.info("found initialised cdm entity '" + fieldName + "' in object of type " + clazz.getName() + " with id " + cdmEntity.getId());