Skip extended data check if root doesn't contains dataset.

Signed-off-by: Carl Thronson <cthronson@actuate.com>
eclipse-birt · Dec 31, 2014 · e0227e5 · e0227e5
1 parent d97156b
commit e0227e5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/....designer.ui/src/org/eclipse/birt/report/designer/internal/ui/dnd/InsertInLayoutUtil.java b/....designer.ui/src/org/eclipse/birt/report/designer/internal/ui/dnd/InsertInLayoutUtil.java
@@ -1077,7 +1077,7 @@ else if ( DesignChoiceConstants.ANALYSIS_TYPE_MEASURE.equals( UIUtil.getColumnAn
 				}
 			}
 			else if ( root.getDataSet( ) == dataSet
-					|| ( getAdapter( ) != null && getAdapter( ).resolveExtendedData( root.getDataSet( ) )
+					|| ( getAdapter( ) != null && root.getDataSet( )!=null && getAdapter( ).resolveExtendedData( root.getDataSet( ) )
 							.equals( getAdapter( ).resolveExtendedData( dataSet ) ) ) )
 			{
 				container = DEUtil.getBindingHolder( container );