Fix for #5953 - ClassPathExplorer fails to reset System.out/System.err

svn changeset:15875/svn branch:6.4

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
index ea4cbcb663c4a43ff7f8181f8299181ce520424e..45b3d5a1c9357661907230af4e551e5a20028667 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
@@ -523,17 +523,14 @@ public class ClassPathExplorer {
      */
     private static void tryToAdd(final String fullclassName,
             Collection<Class<? extends Paintable>> paintables) {
+        PrintStream out = System.out;
+        PrintStream err = System.err;
         try {
-            PrintStream out = System.out;
-            PrintStream err = System.err;
             System.setErr(devnull);
             System.setOut(devnull);
 
             Class<?> c = Class.forName(fullclassName);
 
-            System.setErr(err);
-            System.setOut(out);
-
             if (c.getAnnotation(ClientWidget.class) != null) {
                 paintables.add((Class<? extends Paintable>) c);
                 // System.out.println("Found paintable " + fullclassName);
@@ -547,6 +544,9 @@ public class ClassPathExplorer {
             // NOP
         } catch (Exception e) {
             e.printStackTrace();
+        } finally {
+            System.setErr(err);
+            System.setOut(out);
         }
     }
 
@@ -614,4 +614,4 @@ public class ClassPathExplorer {
         }
     }
 
-}
\ No newline at end of file
+}