Report problematic class only once and let it crash

Relates to #69
luontola · Dec 18, 2015 · a1c10cc · a1c10cc
1 parent 60bcc67
commit a1c10cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/Transformers.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/Transformers.java
@@ -126,7 +126,7 @@ private byte[] transform(String className, Consumer<ClassVisitor> reader, ClassV
             if (className != null) {
                 className = className.replace('/', '.');
             }
-            throw new RuntimeException("Failed to transform class " + className, t);
+            throw new RuntimeException("Failed to backport class: " + className, t);
         }
     }
 

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/LambdaClassSaver.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/LambdaClassSaver.java
@@ -8,6 +8,8 @@
 import net.orfjackal.retrolambda.files.OutputDirectory;
 import org.objectweb.asm.ClassReader;
 
+import java.io.IOException;
+
 public class LambdaClassSaver {
 
     private final OutputDirectory saver;
@@ -25,14 +27,12 @@ public void saveIfLambda(String className, byte[] bytecode) {
     }
 
     private void reifyLambdaClass(String className, byte[] bytecode) {
+        System.out.println("Saving lambda class: " + className);
+        bytecode = transformers.backportLambdaClass(new ClassReader(bytecode));
         try {
-            System.out.println("Saving lambda class: " + className);
-            saver.writeClass(transformers.backportLambdaClass(new ClassReader(bytecode)));
-
-        } catch (Throwable t) {
-            // print to stdout to keep in sync with other log output
-            System.out.println("ERROR: Failed to backport lambda class: " + className);
-            t.printStackTrace(System.out);
+            saver.writeClass(bytecode);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
     }
 }