Skip to content

Commit f004395

Browse files
committed
Small fix
1 parent 4c8fa9c commit f004395

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/v1/internal/connector.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -477,10 +477,12 @@ class Connection {
477477
* @protected
478478
*/
479479
_markInitialized(metadata) {
480-
const serverVersion = metadata.server;
480+
const serverVersion = metadata ? metadata.server : null;
481481
if (!this.server.version) {
482482
this.server.version = serverVersion;
483-
if (ServerVersion.fromString(serverVersion).compareTo(VERSION_3_2_0) < 0) {
483+
484+
const version = ServerVersion.fromString(serverVersion);
485+
if (version.compareTo(VERSION_3_2_0) < 0) {
484486
this._packer.disableByteArrays();
485487
}
486488
}
@@ -533,9 +535,7 @@ class ConnectionState {
533535
}
534536
},
535537
onCompleted: metaData => {
536-
if (metaData && metaData.server) {
537-
this._connection._markInitialized(metaData);
538-
}
538+
this._connection._markInitialized(metaData);
539539
this._initialized = true;
540540
if (this._resolvePromise) {
541541
this._resolvePromise(this._connection);

test/v1/types.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ describe('byte arrays', () => {
143143
let originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
144144
let serverSupportsByteArrays = false;
145145

146-
beforeEach(done => {
146+
beforeAll(done => {
147147
jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000;
148148

149149
const driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken);
@@ -156,7 +156,7 @@ describe('byte arrays', () => {
156156
});
157157
});
158158

159-
afterEach(() => {
159+
afterAll(() => {
160160
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
161161
});
162162

0 commit comments

Comments
 (0)