Skip to content

Commit 82560eb

Browse files
committed
[fixup] use lazy reference to startup options
1 parent 7506ff6 commit 82560eb

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public class DefaultDriverContext implements InternalDriverContext {
192192
private final RequestTracker requestTrackerFromBuilder;
193193
private final Map<String, Predicate<Node>> nodeFiltersFromBuilder;
194194
private final ClassLoader classLoader;
195-
private final Map<String, String> startupOptions;
195+
private final LazyReference<Map<String, String>> startupOptionsRef;
196196

197197
public DefaultDriverContext(
198198
DriverConfigLoader configLoader,
@@ -229,7 +229,8 @@ public DefaultDriverContext(
229229
"requestTracker", () -> buildRequestTracker(requestTrackerFromBuilder), cycleDetector);
230230
this.nodeFiltersFromBuilder = nodeFilters;
231231
this.classLoader = classLoader;
232-
this.startupOptions = buildStartupOptions().build();
232+
this.startupOptionsRef =
233+
new LazyReference<>("startupOptions", () -> buildStartupOptions().build(), cycleDetector);
233234
}
234235

235236
/**
@@ -748,6 +749,6 @@ public ProtocolVersion getProtocolVersion() {
748749
@NonNull
749750
@Override
750751
public Map<String, String> getStartupOptions() {
751-
return startupOptions;
752+
return startupOptionsRef.get();
752753
}
753754
}

0 commit comments

Comments
 (0)