fix printWarnings NPE when class null

unimined · Jul 8, 2024 · 9113f54 · 9113f54
1 parent 40a2c6d
commit 9113f54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
-version=0.8.0
+version=0.8.1
 
 asm_version=9.7
 

diff --git a/src/main/java/xyz/wagyourtail/jvmdg/version/VersionProvider.java b/src/main/java/xyz/wagyourtail/jvmdg/version/VersionProvider.java
@@ -729,8 +729,10 @@ public boolean isInitialized() {
     }
 
     public ClassNode downgrade(final ClassDowngrader downgrader, ClassNode clazz, final Set<ClassNode> extra, final boolean enableRuntime, final Function<String, ClassNode> getReadOnly) throws IOException {
+        String className = clazz.name;
+
         if (clazz.version != inputVersion)
-            throw new IllegalArgumentException("Class " + clazz.name + " is not version " + inputVersion);
+            throw new IllegalArgumentException("Class " + className + " is not version " + inputVersion);
 
         ensureInit(downgrader);
         final Set<String> warnings = new LinkedHashSet<>();
@@ -800,7 +802,7 @@ public List<Pair<Type, Boolean>> apply(Type o) throws IOException {
 
         clazz = stubClasses(clazz, enableRuntime, warnings);
         if (clazz == null) {
-            printWarnings(warnings, clazz.name);
+            printWarnings(warnings, className);
             return null;
         }
         clazz = stubWithExtras(clazz, extra, new IOFunction<ClassNode, ClassNode>() {
@@ -810,7 +812,7 @@ public ClassNode apply(ClassNode classNode) throws IOException {
             }
         });
         if (clazz == null) {
-            printWarnings(warnings, clazz.name);
+            printWarnings(warnings, className);
             return null;
         }
         clazz = stubWithExtras(clazz, extra, new IOFunction<ClassNode, ClassNode>() {
@@ -820,7 +822,7 @@ public ClassNode apply(ClassNode classNode) throws IOException {
             }
         });
         if (clazz == null) {
-            printWarnings(warnings, clazz.name);
+            printWarnings(warnings, className);
             return null;
         }
         clazz = stubWithExtras(clazz, extra, new IOFunction<ClassNode, ClassNode>() {
@@ -830,10 +832,10 @@ public ClassNode apply(ClassNode classNode) throws IOException {
             }
         });
         if (clazz == null) {
-            printWarnings(warnings, clazz.name);
+            printWarnings(warnings, className);
             return null;
         }
-        printWarnings(warnings, clazz.name);
+        printWarnings(warnings, className);
         clazz.version = inputVersion - 1;
         return clazz;
     }