test/jdk/javax/imageio/plugins/shared/BitDepth.java

*** 21,31 ****
   * questions.
   */
  
  /**
   * @test
!  * @bug     4413109 4418221 6607198 8147448
   * @run     main BitDepth
   * @summary Checks that ImageIO writers for standard formats can handle
   *          various BufferedImage RGB types. An optional list of arguments
   *          may be used to test the writers for a different list of formats.
   */
--- 21,31 ----
   * questions.
   */
  
  /**
   * @test
!  * @bug     4413109 4418221 6607198 8147448 8204187
   * @run     main BitDepth
   * @summary Checks that ImageIO writers for standard formats can handle
   *          various BufferedImage RGB types. An optional list of arguments
   *          may be used to test the writers for a different list of formats.
   */
*** 195,213 ****
          Iterator<ImageWriter> writers = ImageIO.getImageWriters(spec, format);
          File file = new File("BitDepth_" + biTypeNames[type] + "." + format);
          if (!writers.hasNext()) {
              System.out.println("\tNo writers available for type " + biTypeNames[type]
                                 + " BufferedImage!");
          } else {
              ImageWriter writer = writers.next();
              try (ImageOutputStream out = ImageIO.createImageOutputStream(file)) {
                  writer.setOutput(out);
                  writer.write(bi);
              } catch (Exception e) {
                  System.out.println("\tCan't write a type " +  biTypeNames[type]
                             + " BufferedImage!");
!                 return null;
              }
          }
  
          return file;
      }
--- 195,214 ----
          Iterator<ImageWriter> writers = ImageIO.getImageWriters(spec, format);
          File file = new File("BitDepth_" + biTypeNames[type] + "." + format);
          if (!writers.hasNext()) {
              System.out.println("\tNo writers available for type " + biTypeNames[type]
                                 + " BufferedImage!");
+             return null;
          } else {
              ImageWriter writer = writers.next();
              try (ImageOutputStream out = ImageIO.createImageOutputStream(file)) {
                  writer.setOutput(out);
                  writer.write(bi);
              } catch (Exception e) {
                  System.out.println("\tCan't write a type " +  biTypeNames[type]
                             + " BufferedImage!");
!                 throw new RuntimeException(e);
              }
          }
  
          return file;
      }