revert eager static ref to plugin + better exception handling around render

Author: simonbasle

src/main/java/rx/exceptions/OnErrorThrowable.java

@@ -110,8 +110,6 @@ public static class OnNextValue extends RuntimeException {
 
         private static final long serialVersionUID = -3454462756050397899L;
 
-        private static final RxJavaErrorHandler ERROR_HANDLER = RxJavaPlugins.getInstance().getErrorHandler();
-
         private final Object value;
 
         /**
@@ -164,7 +162,7 @@ private static String renderValue(Object value){
                 return ((Enum<?>) value).name();
             }
 
-            String pluggedRendering = ERROR_HANDLER.handleOnNextValueRendering(value);
+            String pluggedRendering = RxJavaPlugins.getInstance().getErrorHandler().handleOnNextValueRendering(value);
             if (pluggedRendering != null) {
                 return pluggedRendering;
             }

src/main/java/rx/plugins/RxJavaErrorHandler.java

@@ -18,6 +18,7 @@
 import rx.Observable;
 import rx.Subscriber;
 import rx.annotations.Experimental;
+import rx.exceptions.Exceptions;
 import rx.exceptions.OnErrorThrowable;
 
 /**
@@ -65,11 +66,15 @@ public void handleError(Throwable e) {
      */
     @Experimental
     public final String handleOnNextValueRendering(Object item) {
+
         try {
             return render(item);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         } catch (Throwable t) {
-            return item.getClass().getName() + ERROR_IN_RENDERING_SUFFIX;
+            Exceptions.throwIfFatal(t);
         }
+        return item.getClass().getName() + ERROR_IN_RENDERING_SUFFIX;
     }
 
     /**
@@ -84,9 +89,10 @@ public final String handleOnNextValueRendering(Object item) {
      *
      * @param item the last emitted item, that caused the exception wrapped in {@link OnErrorThrowable.OnNextValue}.
      * @return a short {@link String} representation of the item if one is known for its type, or null for default.
+     * @throws InterruptedException if the rendering thread is interrupted
      */
     @Experimental
-    protected String render (Object item) {
+    protected String render (Object item) throws InterruptedException {
         //do nothing by default
         return null;
     }