Project

General

Profile

« Previous | Next » 

Revision 5405bf47

Added by Andreas Müller over 4 years ago

fix problem in CacheLoader

View differences:

cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CacheLoader.java
87 87
        } else if (obj instanceof Collection) {
88 88
            return (T) load((Collection<T>)obj, alreadyVisitedEntities, update);
89 89
        } else if (obj instanceof MergeResult) {
90
            return (T) loadRecursive((MergeResult<?>)obj, alreadyVisitedEntities, update);
90
            return (T) loadRecursive((MergeResult<CdmBase>)obj, alreadyVisitedEntities, update);
91 91
        }
92 92

  
93 93
        if (logger.isInfoEnabled()){logger.info("No caching yet for type " + obj.getClass().getName());}
......
203 203
        return new MergeResult<>(cdmBase, mergeResult.getNewEntities());
204 204
    }
205 205

  
206
    public MergeResult<CdmBase> loadRecursive(MergeResult<CdmBase> mergeResult,List<Object> alreadyVisitedEntities, boolean update) {
206
    public MergeResult<CdmBase> loadRecursive(MergeResult<CdmBase> mergeResult, List<Object> alreadyVisitedEntities, boolean update) {
207 207
        CdmBase cdmBase = loadRecursive(mergeResult.getMergedEntity(), alreadyVisitedEntities, update);
208 208
        loadRecursive(mergeResult.getNewEntities(), alreadyVisitedEntities, update);
209 209
        return new MergeResult<>(cdmBase, mergeResult.getNewEntities());

Also available in: Unified diff