mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119722 mrogers: Merge Activiti update ACE-1636 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -107,12 +107,16 @@ public class Index extends AbstractDbObject
|
||||
if (!super.equals(obj)) return false;
|
||||
if (getClass() != obj.getClass()) return false;
|
||||
Index other = (Index) obj;
|
||||
if (this.unique != other.unique)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (this.columnNames == null)
|
||||
{
|
||||
if (other.columnNames != null) return false;
|
||||
}
|
||||
else if (!this.columnNames.equals(other.columnNames)) return false;
|
||||
if (this.unique != other.unique) return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -136,11 +140,16 @@ public class Index extends AbstractDbObject
|
||||
}
|
||||
else
|
||||
{
|
||||
// If one index is unique and the other is not then it is not a match
|
||||
if (this.unique != other.unique)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// The name may be different, but if it has the same parent table (see above)
|
||||
// and indexes the same columns, then it is the same index.
|
||||
return columnNames.equals(other.getColumnNames());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user