From baf7d67aadca53c7657d4598504f3211d3f3904b Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Wed, 19 Aug 2020 11:05:54 +0100 Subject: [PATCH 1/2] Fix NPE when using ClassLoaderClassProvider --- .../bombe/asm/jar/ClassLoaderClassProvider.java | 2 ++ build.gradle | 2 +- changelogs/0.3.4.md | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 changelogs/0.3.4.md diff --git a/bombe-asm/src/main/java/org/cadixdev/bombe/asm/jar/ClassLoaderClassProvider.java b/bombe-asm/src/main/java/org/cadixdev/bombe/asm/jar/ClassLoaderClassProvider.java index 5eefcae..035e4b0 100644 --- a/bombe-asm/src/main/java/org/cadixdev/bombe/asm/jar/ClassLoaderClassProvider.java +++ b/bombe-asm/src/main/java/org/cadixdev/bombe/asm/jar/ClassLoaderClassProvider.java @@ -55,6 +55,8 @@ public byte[] get(final String klass) { final String internalName = klass + ".class"; try (final InputStream in = this.loader.getResourceAsStream(internalName)) { + if (in == null) return null; + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteStreams.copy(in, baos); return baos.toByteArray(); diff --git a/build.gradle b/build.gradle index 11917ea..8287b4c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ subprojects { group = 'org.cadixdev' archivesBaseName = project.name.toLowerCase() - version = '0.3.3' + version = '0.3.4-SNAPSHOT' repositories { mavenCentral() diff --git a/changelogs/0.3.4.md b/changelogs/0.3.4.md new file mode 100644 index 0000000..4541fb1 --- /dev/null +++ b/changelogs/0.3.4.md @@ -0,0 +1,10 @@ +Bombe 0.3.4 +=========== + +Bombe 0.3.4 resolves a regression made when splitting up the previous systems in +Bombe 0.2.x, specifically a `NullPointerException` that can occur when using +`ClassLoaderClassProvider`. + +*As Bombe 0.3.x is still in use by the latest version of Lorenz and Atlas, and +used in software running today - this is why a further release to 0.3 is being +made*. From bf5fa43afa96d405a3a1952731918633abef2430 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Wed, 19 Aug 2020 11:11:54 +0100 Subject: [PATCH 2/2] 0.3.4: Release Time --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8287b4c..1ff6f10 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ subprojects { group = 'org.cadixdev' archivesBaseName = project.name.toLowerCase() - version = '0.3.4-SNAPSHOT' + version = '0.3.4' repositories { mavenCentral()