Skip to content

Commit d4d5bb0

Browse files
committed
PULL instead of DISCARD for COMMIT response
1 parent 22b45ac commit d4d5bb0

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

driver/src/main/java/org/neo4j/driver/internal/ExplicitTransaction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ public void close()
123123
if ( state == State.MARKED_SUCCESS )
124124
{
125125
conn.run( "COMMIT", Collections.<String, Value>emptyMap(), Collector.NO_OP );
126-
conn.discardAll( new BookmarkCollector( this ) );
126+
conn.pullAll( new BookmarkCollector( this ) );
127127
conn.sync();
128128
state = State.SUCCEEDED;
129129
}
130130
else if ( state == State.MARKED_FAILED || state == State.ACTIVE )
131131
{
132132
conn.run( "ROLLBACK", Collections.<String, Value>emptyMap(), Collector.NO_OP );
133-
conn.discardAll( new BookmarkCollector( this ) );
133+
conn.pullAll( new BookmarkCollector( this ) );
134134
conn.sync();
135135
state = State.ROLLED_BACK;
136136
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import org.neo4j.driver.v1.util.ServerVersion;
2929
import org.neo4j.driver.v1.util.TestNeo4jSession;
3030

31+
import static org.hamcrest.MatcherAssert.assertThat;
32+
import static org.hamcrest.core.StringStartsWith.startsWith;
3133
import static org.junit.Assert.assertNotNull;
3234
import static org.junit.Assert.assertNull;
3335
import static org.junit.Assume.assumeTrue;
@@ -63,5 +65,6 @@ public void shouldReceiveBookmarkOnSuccessfulCommit() throws Throwable
6365

6466
// Then
6567
assertNotNull( session.lastBookmark() );
68+
assertThat( session.lastBookmark(), startsWith( "neo4j:bookmark:v1:tx" ) );
6669
}
6770
}

0 commit comments

Comments
 (0)