Skip to content

Commit 8d7d8c7

Browse files
authored
JAVA-2071: Fix NPE in ArrayBackedRow.toString() (apache#1156)
1 parent c6f4825 commit 8d7d8c7

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

changelog/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- [improvement] JAVA-2025: Include exception message in Abstract\*Codec.accepts(null).
66
- [improvement] JAVA-1980: Use covariant return types in RemoteEndpointAwareJdkSSLOptions.Builder methods.
77
- [documentation] JAVA-2062: Document frozen collection preference with Mapper.
8+
- [bug] JAVA-2071: Fix NPE in ArrayBackedRow.toString().
89

910

1011
### 3.6.0

driver-core/src/main/java/com/datastax/driver/core/ArrayBackedRow.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,15 @@ public String toString() {
123123
if (i != 0) sb.append(", ");
124124
ByteBuffer bb = data.get(i);
125125
if (bb == null) sb.append("NULL");
126-
else
127-
sb.append(
128-
getCodecRegistry()
129-
.codecFor(metadata.getType(i))
130-
.deserialize(bb, protocolVersion)
131-
.toString());
126+
else {
127+
Object o =
128+
getCodecRegistry().codecFor(metadata.getType(i)).deserialize(bb, protocolVersion);
129+
if (o == null) {
130+
sb.append("NULL");
131+
} else {
132+
sb.append(o.toString());
133+
}
134+
}
132135
}
133136
sb.append(']');
134137
return sb.toString();

0 commit comments

Comments
 (0)