Skip to content

Commit 7c5c089

Browse files
committed
Let a null input to CSVRecord#get(Enum) fail in CSVRecord#get(String).
1 parent e3eca25 commit 7c5c089

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/main/java/org/apache/commons/csv/CSVRecord.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.List;
2525
import java.util.Map;
2626
import java.util.Map.Entry;
27+
import java.util.Objects;
2728

2829
/**
2930
* A CSV record parsed from a CSV file.
@@ -65,7 +66,7 @@ public final class CSVRecord implements Serializable, Iterable<String> {
6566
* @return the String at the given enum String
6667
*/
6768
public String get(final Enum<?> e) {
68-
return get(e.toString());
69+
return get(Objects.toString(e, null));
6970
}
7071

7172
/**

src/test/java/org/apache/commons/csv/CSVRecordTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ public void testGetUnmappedEnum() {
9191
assertThrows(IllegalArgumentException.class, () -> recordWithHeader.get(EnumFixture.UNKNOWN_COLUMN));
9292
}
9393

94+
@Test
95+
public void testGetNullEnum() {
96+
assertThrows(IllegalArgumentException.class, () -> recordWithHeader.get((Enum<?>) null));
97+
}
98+
9499
@Test
95100
public void testGetUnmappedName() {
96101
assertThrows(IllegalArgumentException.class, () -> assertNull(recordWithHeader.get("fourth")));

0 commit comments

Comments
 (0)