Skip to content

Commit 2e5637f

Browse files
committed
Fix wrong format placeholder in logging
1 parent 0a43f77 commit 2e5637f

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.firebirdsql.jaybird.util.Cleaners;
2323
import org.firebirdsql.jna.fbclient.FbClientLibrary;
2424

25+
import java.lang.System.Logger.Level;
2526
import java.lang.ref.Cleaner;
2627
import java.lang.reflect.Proxy;
2728

@@ -80,7 +81,7 @@ void dispose() {
8081
disposeImpl();
8182
} catch (Throwable e) {
8283
System.getLogger(FbClientResource.class.getName())
83-
.log(System.Logger.Level.ERROR, "Error disposing of " + local, e);
84+
.log(Level.ERROR, "Error disposing of " + local, e);
8485
}
8586
}
8687

@@ -102,18 +103,18 @@ private record DisposeAction(FbClientLibrary library) implements Runnable {
102103
public void run() {
103104
System.Logger log = System.getLogger(FbClientResource.class.getName());
104105
try {
105-
log.log(System.Logger.Level.TRACE, "Calling fb_shutdown on %s", library);
106+
log.log(Level.TRACE, "Calling fb_shutdown on {0}", library);
106107
library.fb_shutdown(0, 1);
107108
} finally {
108109
FbClientFeatureAccessHandler handler =
109110
(FbClientFeatureAccessHandler) Proxy.getInvocationHandler(library);
110111
NativeLibrary nativeLibrary = handler.getNativeLibrary();
111-
log.log(System.Logger.Level.TRACE, "Disposing JNA native library {0}", nativeLibrary);
112+
log.log(Level.TRACE, "Disposing JNA native library {0}", nativeLibrary);
112113
try {
113114
// Retaining use of dispose for backwards compatibility with older JNA versions for now
114115
nativeLibrary.dispose();
115116
} catch (Throwable e) {
116-
log.log(System.Logger.Level.ERROR, "Error disposing of " + nativeLibrary, e);
117+
log.log(Level.ERROR, "Error disposing of " + nativeLibrary, e);
117118
}
118119
}
119120
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void onResponse(Response response) {
9797
}
9898
} else {
9999
System.getLogger(getClass().getName()).log(DEBUG,
100-
"Expected response of type GenericResponse for blob open, but received a %s",
100+
"Expected response of type GenericResponse for blob open, but received a {0}",
101101
response != null ? response.getClass().getName() : "(null)");
102102
}
103103
}
@@ -129,7 +129,7 @@ public void onResponse(Response response) {
129129
processBlobInfoOnDeferredOpenResponse(genericResponse);
130130
} else {
131131
System.getLogger(getClass().getName()).log(DEBUG,
132-
"Expected response of type GenericResponse for blob info on deferred open, but received a %s",
132+
"Expected response of type GenericResponse for blob info on deferred open, but received a {0}",
133133
response != null ? response.getClass().getName() : "(null)");
134134
}
135135
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void onResponse(Response response) {
8383
}
8484
} else {
8585
System.getLogger(getClass().getName()).log(System.Logger.Level.DEBUG,
86-
"Expected response of type GenericResponse for blob create, but received a %s",
86+
"Expected response of type GenericResponse for blob create, but received a {0}",
8787
response != null ? response.getClass().getName() : "(null)");
8888
}
8989
}

0 commit comments

Comments
 (0)