From 5151b757e7ed1ceee84077eaabec75d4328a4312 Mon Sep 17 00:00:00 2001 From: Mark Rotteveel Date: Wed, 6 Nov 2024 16:48:43 +0100 Subject: [PATCH] #779 Improve wording of possible connection rejection reason, update FAQ --- src/docs/asciidoc/faq.adoc | 2 +- src/main/org/firebirdsql/gds/ng/wire/WireConnection.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/docs/asciidoc/faq.adoc b/src/docs/asciidoc/faq.adoc index 04f4b8853..4511117e5 100644 --- a/src/docs/asciidoc/faq.adoc +++ b/src/docs/asciidoc/faq.adoc @@ -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] diff --git a/src/main/org/firebirdsql/gds/ng/wire/WireConnection.java b/src/main/org/firebirdsql/gds/ng/wire/WireConnection.java index a1d988219..41a76de87 100644 --- a/src/main/org/firebirdsql/gds/ng/wire/WireConnection.java +++ b/src/main/org/firebirdsql/gds/ng/wire/WireConnection.java @@ -76,9 +76,9 @@ public abstract class WireConnection, 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)