Skip to content

Commit

Permalink
#779 Improve wording of possible connection rejection reason, update FAQ
Browse files Browse the repository at this point in the history
  • Loading branch information
mrotteveel committed Nov 6, 2024
1 parent 43bb155 commit 5151b75
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/docs/asciidoc/faq.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ Connecting to unsupported Firebird versions with the pure Java protocol can resu
There are two options to address this:
. Specify connection property `enableProtocol` with a list of unsupported protocol versions to try in addition to the supported protocol versions, or `"{asterisk}"` to try all available protocol versions (e.g. `enableProtocol=12` or `enableProtocol={asterisk}`).
. Specify connection property `enableProtocol` with a list of unsupported protocol versions to try in addition to the supported protocol versions, or `"{asterisk}"` to try all available protocol versions (e.g. `enableProtocol=12` to try protocol 12 (Firebird 2.5) or `enableProtocol={asterisk}` to try all unsupported protocols).
. Use a native connection instead of a pure Java connection.
[#error-occurred-during-login-please-check-server-firebird-log-for-details-335545106]
Expand Down
6 changes: 3 additions & 3 deletions src/main/org/firebirdsql/gds/ng/wire/WireConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ public abstract class WireConnection<T extends IAttachProperties<T>, C extends F

private static final System.Logger log = System.getLogger(WireConnection.class.getName());
private static final String REJECTION_POSSIBLE_REASON =
"The server and client could not agree on connection options. A possible reasons is attempting to connect "
+ "to an unsupported Firebird version. See the documentation of connection property 'enableProtocol' for "
+ "a possible workaround.";
"The server and client could not agree on connection options. A possible reason is attempting to connect "
+ "to an unsupported Firebird version; see the documentation of connection property 'enableProtocol' for "
+ "a workaround.";
private static final WarningMessageCallback NOOP_WARNING_MESSAGE_CALLBACK = warning -> {};

// Micro-optimization: we usually expect at most 3 (Firebird 5)
Expand Down

0 comments on commit 5151b75

Please sign in to comment.