[#GROOVY-1956] null's in lists are not handled correctly for unique(), sort()

groovy

null's in lists are not handled correctly for unique(), sort()

Created: 28/Jun/07 05:57 AM Updated: 28/Jun/07 07:26 AM

Component/s:

None

Affects Version/s:

1.1-beta-1

Fix Version/s:

1.1-beta-2

Time Tracking:

Not Specified

Description

« Hide

For this list:

def x = [1, 2, 3, 1, 2, 3, null, 'a', null]

Both these throw NPE:

println x.unique()
println x.sort()

All

Comments

Work Log

Change History

Sort Order:

[ Permalink | « Hide ]

Michael Baehr added a comment - 28/Jun/07 06:23 AM

In DefaultGroovyMethods.java, locate the inner class NumberComparator.

Instead of
public int compare(Object o1, Object o2) {
if (o1 instanceof Number && o2 instanceof Number) {
...

check for null first:

public int compare(Object o1, Object o2) {
if (o1 == null) { return o2==null?0:-1; } else if (o2 == null) { return 1; } else if (o1 instanceof Number && o2 instanceof Number) {
...

This solves the NPE problem.

[ Permalink | « Hide ]

Michael Baehr added a comment - 28/Jun/07 06:27 AM

Just discovered the code tag ...

In DefaultGroovyMethods.java, locate the inner class NumberComparator.

Instead of

public int compare(Object o1, Object o2) {
  if (o1 instanceof Number && o2 instanceof Number) {
    ...

check for null first:

public int compare(Object o1, Object o2) {
  if (o1 == null) { 
    return o2==null?0:-1; 
  } else if (o2 == null) {
    return 1; 
  } else if (o1 instanceof Number && o2 instanceof Number) {
    ...

This solves the NPE problem.

[ Permalink | « Hide ]

Paul King added a comment - 28/Jun/07 07:26 AM

Patch and tests added.