Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2015-06-22 15:58:19 +0000
committerLaurent Goubet2015-06-23 13:57:55 +0000
commit0147d5ad04f2dba6054da7030955d5e347960483 (patch)
tree22fee6148a7ce0e352a4e41c58b6e3d1a15f938a /plugins
parent9e880491e7ddd39b5cf6208c7e0099020dfe4f7c (diff)
downloadorg.eclipse.emf.compare-0147d5ad04f2dba6054da7030955d5e347960483.tar.gz
org.eclipse.emf.compare-0147d5ad04f2dba6054da7030955d5e347960483.tar.xz
org.eclipse.emf.compare-0147d5ad04f2dba6054da7030955d5e347960483.zip
Fix NPE in EMFModelProvider
Change-Id: Ie716a88398c77b6866379888e84573db8236e495 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java
index 9fed1d857..b50cc0729 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java
@@ -252,11 +252,11 @@ public class EMFModelProvider extends ModelProvider {
for (IResource res : syncModel.getResources()) {
resourceMappingCache.put(res, syncModel);
}
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("EMFModelProvider - Minimizing model"); //$NON-NLS-1$
+ }
+ new IdenticalResourceMinimizer().minimize(syncModel, monitor);
}
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("EMFModelProvider - Minimizing model"); //$NON-NLS-1$
- }
- new IdenticalResourceMinimizer().minimize(syncModel, monitor);
} else if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Cache FOUND entry for " + file); //$NON-NLS-1$
}

Back to the top