From ddcf7babced4ea47426ce75aab810ebf1f70d111 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 12 Aug 2015 14:37:44 +0300
Subject: [PATCH] 8131926:
 java/beans/SimpleBeanInfo/LoadingStandardIcons/LoadingStandardIcons.java
 failure with modular JDK

Reviewed-by: azvegint, alexsch
---
 .../share/classes/java/beans/SimpleBeanInfo.java    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/jdk/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java b/jdk/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java
index 45d5b44ba58..20d23127cdf 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/SimpleBeanInfo.java
@@ -27,8 +27,7 @@ package java.beans;
 
 import java.awt.Image;
 import java.awt.Toolkit;
-import java.awt.image.ImageProducer;
-import java.net.URL;
+import java.io.InputStream;
 
 /**
  * This is a support class to make it easier for people to provide
@@ -122,14 +121,8 @@ public class SimpleBeanInfo implements BeanInfo {
      * @return  an image object.  May be null if the load failed.
      */
     public Image loadImage(final String resourceName) {
-        try {
-            final URL url = getClass().getResource(resourceName);
-            if (url != null) {
-                final ImageProducer ip = (ImageProducer) url.getContent();
-                if (ip != null) {
-                    return Toolkit.getDefaultToolkit().createImage(ip);
-                }
-            }
+        try (InputStream in = getClass().getResourceAsStream(resourceName)) {
+            return Toolkit.getDefaultToolkit().createImage(in.readAllBytes());
         } catch (final Exception ignored) {
         }
         return null;