Bugfix: Recover from LinkageErrors if they happen when getting the By…

…teString class. This is part of #24
google · Nov 14, 2022 · 46c5758 · 46c5758
1 parent 481c9c4
commit 46c5758
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...t4/src/main/java/com/google/testing/junit/testparameterinjector/ByteStringReflection.java b/...t4/src/main/java/com/google/testing/junit/testparameterinjector/ByteStringReflection.java
@@ -58,7 +58,7 @@ static byte[] byteStringToByteArray(Object byteString) {
   private static Optional<Class<?>> maybeGetByteStringClass() {
     try {
       return Optional.of(Class.forName("com.google.protobuf.ByteString"));
-    } catch (ClassNotFoundException unused) {
+    } catch (ClassNotFoundException | LinkageError unused) {
       return Optional.absent();
     }
   }

diff --git a/...main/java/com/google/testing/junit/testparameterinjector/junit5/ByteStringReflection.java b/...main/java/com/google/testing/junit/testparameterinjector/junit5/ByteStringReflection.java
@@ -58,7 +58,7 @@ static byte[] byteStringToByteArray(Object byteString) {
   private static Optional<Class<?>> maybeGetByteStringClass() {
     try {
       return Optional.of(Class.forName("com.google.protobuf.ByteString"));
-    } catch (ClassNotFoundException unused) {
+    } catch (ClassNotFoundException | LinkageError unused) {
       return Optional.absent();
     }
   }