Projects >> nuxeo-features >>67366d5718f6f70180f4e2fc09579534e07e5e37

Chunk
Conflicting content
        resultsProvidersCache.remove(name);
    }

<<<<<<< HEAD
    @Observer(value={ EventNames.DOCUMENT_CHILDREN_CHANGED, EventNames.LOCATION_SELECTION_CHANGED }, create=false,inject=false)
    public void invalidateChildrenProvider()
    {
=======
    @Observer(value = {EventNames.DOCUMENT_CHILDREN_CHANGED}, create = false, inject = false)
    public void invalidateChildrenProvider() {
>>>>>>> 68cf8f61d452fdcdc73f4cf0fe44dc50c09f165a
        invalidate(DocumentChildrenStdFarm.CHILDREN_BY_COREAPI);
    }
Solution content
        resultsProvidersCache.remove(name);
    }

    @Observer(value={ EventNames.DOCUMENT_CHILDREN_CHANGED, EventNames.LOCATION_SELECTION_CHANGED }, create=false,inject=false)
    public void invalidateChildrenProvider()
    {
        invalidate(DocumentChildrenStdFarm.CHILDREN_BY_COREAPI);
    }
File
ResultsProvidersCacheBean.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method signature