Skip to content

Commit 0bdf1ab

Browse files
committed
Fix wrong format placeholder in logging
1 parent 03015ef commit 0bdf1ab

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

jaybird-native/src/main/java/org/firebirdsql/gds/ng/jna/FbClientResource.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
// SPDX-FileCopyrightText: Copyright 2019-2024 Mark Rotteveel
1+
// SPDX-FileCopyrightText: Copyright 2019-2025 Mark Rotteveel
22
// SPDX-License-Identifier: LGPL-2.1-or-later
33
package org.firebirdsql.gds.ng.jna;
44

55
import com.sun.jna.NativeLibrary;
66
import org.firebirdsql.jaybird.util.Cleaners;
77
import org.firebirdsql.jna.fbclient.FbClientLibrary;
88

9+
import java.lang.System.Logger.Level;
910
import java.lang.ref.Cleaner;
1011
import java.lang.reflect.Proxy;
1112

@@ -64,7 +65,7 @@ void dispose() {
6465
disposeImpl();
6566
} catch (Throwable e) {
6667
System.getLogger(FbClientResource.class.getName())
67-
.log(System.Logger.Level.ERROR, "Error disposing of " + local, e);
68+
.log(Level.ERROR, "Error disposing of " + local, e);
6869
}
6970
}
7071

@@ -86,18 +87,18 @@ private record DisposeAction(FbClientLibrary library) implements Runnable {
8687
public void run() {
8788
System.Logger log = System.getLogger(FbClientResource.class.getName());
8889
try {
89-
log.log(System.Logger.Level.TRACE, "Calling fb_shutdown on %s", library);
90+
log.log(Level.TRACE, "Calling fb_shutdown on {0}", library);
9091
library.fb_shutdown(0, 1);
9192
} finally {
9293
FbClientFeatureAccessHandler handler =
9394
(FbClientFeatureAccessHandler) Proxy.getInvocationHandler(library);
9495
NativeLibrary nativeLibrary = handler.getNativeLibrary();
95-
log.log(System.Logger.Level.TRACE, "Disposing JNA native library {0}", nativeLibrary);
96+
log.log(Level.TRACE, "Disposing JNA native library {0}", nativeLibrary);
9697
try {
9798
// Retaining use of dispose for backwards compatibility with older JNA versions for now
9899
nativeLibrary.dispose();
99100
} catch (Throwable e) {
100-
log.log(System.Logger.Level.ERROR, "Error disposing of " + nativeLibrary, e);
101+
log.log(Level.ERROR, "Error disposing of " + nativeLibrary, e);
101102
}
102103
}
103104
}

src/main/org/firebirdsql/gds/ng/wire/version11/V11InputBlob.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void onResponse(Response response) {
8181
}
8282
} else {
8383
System.getLogger(getClass().getName()).log(DEBUG,
84-
"Expected response of type GenericResponse for blob open, but received a %s",
84+
"Expected response of type GenericResponse for blob open, but received a {0}",
8585
response != null ? response.getClass().getName() : "(null)");
8686
}
8787
}
@@ -113,7 +113,7 @@ public void onResponse(Response response) {
113113
processBlobInfoOnDeferredOpenResponse(genericResponse);
114114
} else {
115115
System.getLogger(getClass().getName()).log(DEBUG,
116-
"Expected response of type GenericResponse for blob info on deferred open, but received a %s",
116+
"Expected response of type GenericResponse for blob info on deferred open, but received a {0}",
117117
response != null ? response.getClass().getName() : "(null)");
118118
}
119119
}

src/main/org/firebirdsql/gds/ng/wire/version11/V11OutputBlob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void onResponse(Response response) {
6767
}
6868
} else {
6969
System.getLogger(getClass().getName()).log(System.Logger.Level.DEBUG,
70-
"Expected response of type GenericResponse for blob create, but received a %s",
70+
"Expected response of type GenericResponse for blob create, but received a {0}",
7171
response != null ? response.getClass().getName() : "(null)");
7272
}
7373
}

0 commit comments

Comments
 (0)