Skip to content

Commit 1508b1b

Browse files
committed
Merge pull request #94 from sarmbruster/params_npe
fix NPE if 'null' as parameter value is used
2 parents c6804b5 + 2734561 commit 1508b1b

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

driver/src/main/java/org/neo4j/driver/v1/internal/summary/ResultBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class ResultBuilder implements StreamCollector
5252
public ResultBuilder( String statement, Map<String, Value> parameters )
5353
{
5454
Map<String, Value> unmodifiableParameters =
55-
parameters.isEmpty() ? NO_PARAMETERS : unmodifiableMap( parameters );
55+
(parameters == null) || (parameters.isEmpty()) ? NO_PARAMETERS : unmodifiableMap( parameters );
5656
this.summaryBuilder = new SummaryBuilder( new Statement( statement, unmodifiableParameters ) );
5757
}
5858

driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,15 @@ public void shouldBeOpenBeforeCommit() throws Throwable
133133
assertTrue( tx.isOpen() );
134134
}
135135

136+
@Test
137+
public void shouldHandleNullParametersGracefully()
138+
{
139+
// When
140+
session.run("match (n) return count(n)", null);
141+
142+
// Then
143+
// pass - no exception thrown
144+
145+
}
146+
136147
}

0 commit comments

Comments
 (0)