Merge pull request #153 from mdrillin/master

TEIIDDES-1654
Teiid-Designer · May 10, 2013 · 2bb0374 · 2bb0374
2 parents a9d7260 + 7ebace7
commit 2bb0374
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/...id.designer.compare.ui/src/org/teiid/designer/compare/ui/tree/DifferenceReportsPanel.java b/...id.designer.compare.ui/src/org/teiid/designer/compare/ui/tree/DifferenceReportsPanel.java
@@ -38,6 +38,7 @@
 import org.teiid.designer.compare.DifferenceDescriptor;
 import org.teiid.designer.compare.DifferenceReport;
 import org.teiid.designer.compare.ui.UiConstants;
+import org.teiid.designer.core.ModelerCore;
 import org.teiid.designer.ui.common.util.WidgetFactory;
 import org.teiid.designer.ui.common.widget.Dialog;
 import org.teiid.designer.ui.common.widget.Label;
@@ -757,10 +758,15 @@ private DRStats getStats( final List<DifferenceReport> differenceReports ) {
 
         final Iterator<DifferenceReport> diffs = differenceReports.iterator();
         while (diffs.hasNext()) {
-            final DifferenceReport dr = diffs.next();
-            result.adds += dr.getTotalAdditions();
-            result.deletes += dr.getTotalDeletions();
-            result.diffs += dr.getTotalChanges();
+        	final DifferenceReport dr = diffs.next();
+        	if(dr!=null) {
+        		result.adds += dr.getTotalAdditions();
+        		result.deletes += dr.getTotalDeletions();
+        		result.diffs += dr.getTotalChanges();
+        	} else {
+        		String msg = "DifferenceReportsPanel.getStats encountered null report - skipping its stats";  //$NON-NLS-1$
+                ModelerCore.Util.log(IStatus.WARNING, msg);        		
+        	}
         } // while
 
         return result;