Skip to content

Commit d55b678

Browse files
committed
Fix mismatched class names in tracing log prefixes
Several log messages carried a copy-pasted class name from a sibling type: DataOutputStream close/flush said DataInputStream, URLConnection init/getInputStream said URL, Attributes init said Manifest, and JarEntry init said ZipEntry. Correct each to its own class.
1 parent dbfcb2b commit d55b678

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

java_runtime/src/classes/java/io/data_output_stream.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ impl DataOutputStream {
136136
}
137137

138138
async fn close(jvm: &Jvm, _: &mut RuntimeContext, this: ClassInstanceRef<Self>) -> Result<()> {
139-
tracing::debug!("java.io.DataInputStream::close({this:?})");
139+
tracing::debug!("java.io.DataOutputStream::close({this:?})");
140140

141141
let out = jvm.get_field(&this, "out", "Ljava/io/OutputStream;").await?;
142142
let _: () = jvm.invoke_virtual(&out, "close", "()V", []).await?;
@@ -145,7 +145,7 @@ impl DataOutputStream {
145145
}
146146

147147
async fn flush(jvm: &Jvm, _: &mut RuntimeContext, this: ClassInstanceRef<Self>) -> Result<()> {
148-
tracing::debug!("java.io.DataInputStream::flush({this:?})");
148+
tracing::debug!("java.io.DataOutputStream::flush({this:?})");
149149

150150
let out = jvm.get_field(&this, "out", "Ljava/io/OutputStream;").await?;
151151
let _: () = jvm.invoke_virtual(&out, "flush", "()V", []).await?;

java_runtime/src/classes/java/net/url_connection.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ impl URLConnection {
2727
}
2828

2929
async fn init(jvm: &Jvm, _: &mut RuntimeContext, this: ClassInstanceRef<Self>, url: ClassInstanceRef<URL>) -> Result<()> {
30-
tracing::debug!("java.net.URL::<init>({this:?}, {url:?})");
30+
tracing::debug!("java.net.URLConnection::<init>({this:?}, {url:?})");
3131

3232
let _: () = jvm.invoke_special(&this, "java/lang/Object", "<init>", "()V", ()).await?;
3333

3434
Ok(())
3535
}
3636

3737
async fn get_input_stream(jvm: &Jvm, _: &mut RuntimeContext, this: ClassInstanceRef<Self>) -> Result<ClassInstanceRef<InputStream>> {
38-
tracing::debug!("java.net.URL::getInputStream({this:?})");
38+
tracing::debug!("java.net.URLConnection::getInputStream({this:?})");
3939

4040
Err(jvm.exception("java/io/UnknownServiceException", "unsupported").await)
4141
}

java_runtime/src/classes/java/util/jar/attributes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl Attributes {
3030
}
3131

3232
async fn init(jvm: &Jvm, _: &mut RuntimeContext, mut this: ClassInstanceRef<Self>) -> Result<()> {
33-
tracing::debug!("java.util.jar.Manifest::<init>({this:?})");
33+
tracing::debug!("java.util.jar.Attributes::<init>({this:?})");
3434

3535
let _: () = jvm.invoke_special(&this, "java/lang/Object", "<init>", "()V", ()).await?;
3636

java_runtime/src/classes/java/util/jar/jar_entry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl JarEntry {
2626
}
2727

2828
async fn init(jvm: &Jvm, _: &mut RuntimeContext, this: ClassInstanceRef<Self>, entry: ClassInstanceRef<ZipEntry>) -> Result<()> {
29-
tracing::debug!("java.util.zip.ZipEntry::<init>({this:?}, {entry:?})");
29+
tracing::debug!("java.util.jar.JarEntry::<init>({this:?}, {entry:?})");
3030

3131
let _: () = jvm
3232
.invoke_special(&this, "java/util/zip/ZipEntry", "<init>", "(Ljava/util/zip/ZipEntry;)V", (entry,))

0 commit comments

Comments
 (0)