Merged ACE-1636 to HEAD update to Activiti 5.19.0

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2015-11-27 15:59:58 +00:00
parent acb6e2db75
commit 441a1f4ae4
12 changed files with 625 additions and 114 deletions

View File

@@ -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;