Skip to content

Commit 6bc0839

Browse files
Use "conflicting" in variable name
1 parent dc4f40a commit 6bc0839

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/oracle/r2dbc/impl/OracleReactiveJdbcAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ private static String composeJdbcUrl(ConnectionFactoryOptions options) {
482482
*/
483483
private static void validateDescriptorOptions(
484484
ConnectionFactoryOptions options) {
485-
Option<?>[] overlappingOptions =
485+
Option<?>[] conflictingOptions =
486486
Set.of(HOST, PORT, DATABASE, SSL)
487487
.stream()
488488
.filter(options::hasOption)
@@ -494,10 +494,10 @@ private static void validateDescriptorOptions(
494494
! options.getValue(option).toString().isEmpty())
495495
.toArray(Option[]::new);
496496

497-
if (overlappingOptions.length != 0) {
497+
if (conflictingOptions.length != 0) {
498498
throw new IllegalArgumentException(DESCRIPTOR.name()
499499
+ " Option has been specified with potentially conflicting Options: "
500-
+ Arrays.toString(overlappingOptions));
500+
+ Arrays.toString(conflictingOptions));
501501
}
502502
}
503503

0 commit comments

Comments
 (0)