Made code changes to comapre properties of data source handle and dat…

…a source design before updating the data source handle.

model/org.eclipse.birt.report.model.adapter.oda/src/org/eclipse/birt/report/model/adapter/oda/impl/DataSourceAdapter.java

@@ -12,6 +12,7 @@
 import org.eclipse.datatools.connectivity.oda.design.util.DesignUtil;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.EcoreUtil.EqualityHelper;
 
 /*******************************************************************************
  * Copyright (c) 2004 Actuate Corporation. All rights reserved. This program and
@@ -124,7 +125,12 @@ public OdaDataSourceHandle createDataSourceHandle(
  public void updateDataSourceHandle( DataSourceDesign sourceDesign,
  OdaDataSourceHandle sourceHandle ) throws SemanticException
  {
- if ( sourceDesign == null || sourceHandle == null )
+ if ( sourceDesign == null
+ || sourceHandle == null
+ || ( sourceHandle.getExtends( ) != null )
+ && isDataSourceHandleAndDataSourceDesignEqual(
+ sourceHandle,
+ sourceDesign ) )
  return;
 
  DesignUtil.validateObject( sourceDesign );
@@ -184,6 +190,28 @@ public void updateDataSourceHandle( DataSourceDesign sourceDesign,
 
  stack.commit( );
  }
+
+ public boolean isDataSourceHandleAndDataSourceDesignEqual(
+ OdaDataSourceHandle sourceHandle, DataSourceDesign sourceDesign )
+ {
+
+ EqualityHelper equalityHelper = new EcoreUtil.EqualityHelper( );
+ // compare public properties
+ Properties sourceHandlePublicProperties = newOdaPublicProperties(
+ sourceHandle.getExtensionPropertyDefinitionList( ),
+ sourceHandle );
+ if ( !equalityHelper.equals( sourceHandlePublicProperties,
+ sourceDesign.getPublicProperties( ) ) )
+ {
+ return false;
+ }
+
+ // compare private properties
+ Properties sourceHandlePrivateProperties = newOdaPrivateProperties(
+ sourceHandle.privateDriverPropertiesIterator( ) );
+ return equalityHelper.equals( sourceHandlePrivateProperties,
+ sourceDesign.getPrivateProperties( ) );
+ }
 
  public boolean isEqualDataSourceDesign( DataSourceDesign designFromHandle,
  DataSourceDesign design )