Project

General

Profile

« Previous | Next » 

Revision 0d19c47e

Added by Katja Luther over 7 years ago

changes for gbif/abcd import from webservice

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java
71 71
        } else if (obj instanceof Collection) {
72 72
            return (T) load((Collection<T>)obj, recursive, update);
73 73
        } else if(obj instanceof Pager) {
74
             load(((Pager)obj).getRecords(), recursive, update);
75
             return obj;
74
        	load(((Pager)obj).getRecords(), recursive, update);
75
            return obj;
76 76
        } else if(obj instanceof MergeResult) {
77 77
            return (T) load((MergeResult<CdmBase>)obj, recursive, update);
78 78
        }
......
153 153
        return map;
154 154
    }
155 155

  
156
    public <T extends Object> Collection<T> load(Collection<T> collection, boolean recursive, boolean update){
156
    public <T extends Object> Collection<T> load(Collection<T> collection,  boolean recursive, boolean update){
157 157

  
158 158
        Collection<T> loadedCollection;
159 159
        if(isRecursiveEnabled && recursive) {
......
355 355
                    CdmBase cachedCdmEntityInSubGraph = cdmCacher.getFromCache(cdmEntityInSubGraph);
356 356

  
357 357
                    if(cachedCdmEntityInSubGraph != null) {
358
                        if(cachedCdmEntityInSubGraph != cdmEntityInSubGraph) {
358
                        if(!cachedCdmEntityInSubGraph.equals(cdmEntityInSubGraph)) {
359 359
                            // exception : is the case where
360 360
                            // the field has been already initialised, cached and
361 361
                            // is not the same as the one in the cache, in which case we set the value

Also available in: Unified diff