Fixed bug in compareTo
This commit is contained in:
parent
ce0ddaedd6
commit
8035828d49
|
@ -262,9 +262,19 @@ public final class PropertyDefinitionImpl implements PropertyDefinition {
|
|||
return ret;
|
||||
}
|
||||
|
||||
ret = regexp.compareTo(o.regexp);
|
||||
if(ret != 0) {
|
||||
return ret;
|
||||
if(regexp==null && o.regexp!=null) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(o.regexp==null && regexp!=null) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(!(regexp==null && o.regexp==null)) {
|
||||
ret = regexp.compareTo(o.regexp);
|
||||
if(ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
return propertyTypeName.toString().compareTo(o.propertyTypeName.toString());
|
||||
|
|
Loading…
Reference in New Issue