Skip to content

Commit 0e286a1

Browse files
author
mpv1989
committed
Fix property loading & prepare release 4.3.7
1 parent ae49782 commit 0e286a1

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

ChangeLog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
v4.3.7 (2018-xx-xx)
1+
v4.3.7 (2018-04-17)
22
---------------------------
33

4+
* fixed property loading
45

56
v4.3.6 (2018-04-16)
67
---------------------------

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.arangodb</groupId>
66
<artifactId>arangodb-java-driver</artifactId>
7-
<version>4.3.7-SNAPSHOT</version>
7+
<version>4.3.7</version>
88
<inceptionYear>2016</inceptionYear>
99
<packaging>jar</packaging>
1010

src/main/java/com/arangodb/internal/InternalArangoDB.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ protected static Integer loadMaxConnections(final Properties properties, final I
137137
}
138138

139139
protected static Long loadConnectionTtl(final Properties properties, final Long currentValue) {
140-
return Long.parseLong(getProperty(properties, PROPERTY_KEY_CONNECTION_TTL, currentValue,
141-
ArangoDBConstants.CONNECTION_TTL_VST_DEFAULT));
140+
final String ttl = getProperty(properties, PROPERTY_KEY_CONNECTION_TTL, currentValue,
141+
ArangoDBConstants.CONNECTION_TTL_VST_DEFAULT);
142+
return ttl != null ? Long.parseLong(ttl) : null;
142143
}
143144

144145
protected static Protocol loadProtocol(final Properties properties, final Protocol currentValue) {

0 commit comments

Comments
 (0)