From 7354b1f8c783a5fa329bd1c35997ff84f72ec296 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Thu, 12 Feb 2015 16:17:02 +0100
Subject: [PATCH] Fixed possible NPEs in Metadata.

---
 .../com/twelvemonkeys/imageio/plugins/bmp/BMPMetadata.java   | 5 ++---
 .../com/twelvemonkeys/imageio/plugins/pcx/PCXMetadata.java   | 2 +-
 .../com/twelvemonkeys/imageio/plugins/pnm/PNMMetadata.java   | 2 +-
 .../com/twelvemonkeys/imageio/plugins/sgi/SGIMetadata.java   | 2 +-
 .../com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java   | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPMetadata.java b/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPMetadata.java
index 1148032a..9abbff29 100755
--- a/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPMetadata.java
+++ b/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPMetadata.java
@@ -34,7 +34,6 @@ import org.w3c.dom.Node;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;
-import java.awt.image.IndexColorModel;
 
 /**
  * BMPMetadata.
@@ -58,10 +57,10 @@ final class BMPMetadata extends IIOMetadata {
     }
 
     @Override public Node getAsTree(final String formatName) {
-        if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) {
+        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
             return getStandardTree();
         }
-        else if (formatName.equals(nativeMetadataFormatName)) {
+        else if (nativeMetadataFormatName.equals(formatName)) {
             return getNativeTree();
         }
         else {
diff --git a/imageio/imageio-pcx/src/main/java/com/twelvemonkeys/imageio/plugins/pcx/PCXMetadata.java b/imageio/imageio-pcx/src/main/java/com/twelvemonkeys/imageio/plugins/pcx/PCXMetadata.java
index 13c79853..25b376a7 100755
--- a/imageio/imageio-pcx/src/main/java/com/twelvemonkeys/imageio/plugins/pcx/PCXMetadata.java
+++ b/imageio/imageio-pcx/src/main/java/com/twelvemonkeys/imageio/plugins/pcx/PCXMetadata.java
@@ -53,7 +53,7 @@ final class PCXMetadata extends IIOMetadata {
     }
 
     @Override public Node getAsTree(final String formatName) {
-        if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) {
+        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
             return getStandardTree();
         }
         else {
diff --git a/imageio/imageio-pnm/src/main/java/com/twelvemonkeys/imageio/plugins/pnm/PNMMetadata.java b/imageio/imageio-pnm/src/main/java/com/twelvemonkeys/imageio/plugins/pnm/PNMMetadata.java
index 7304d96f..267439b5 100755
--- a/imageio/imageio-pnm/src/main/java/com/twelvemonkeys/imageio/plugins/pnm/PNMMetadata.java
+++ b/imageio/imageio-pnm/src/main/java/com/twelvemonkeys/imageio/plugins/pnm/PNMMetadata.java
@@ -52,7 +52,7 @@ final class PNMMetadata extends IIOMetadata {
     }
 
     @Override public Node getAsTree(final String formatName) {
-        if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) {
+        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
             return getStandardTree();
         }
         else {
diff --git a/imageio/imageio-sgi/src/main/java/com/twelvemonkeys/imageio/plugins/sgi/SGIMetadata.java b/imageio/imageio-sgi/src/main/java/com/twelvemonkeys/imageio/plugins/sgi/SGIMetadata.java
index 66a00b45..16e8b8b6 100755
--- a/imageio/imageio-sgi/src/main/java/com/twelvemonkeys/imageio/plugins/sgi/SGIMetadata.java
+++ b/imageio/imageio-sgi/src/main/java/com/twelvemonkeys/imageio/plugins/sgi/SGIMetadata.java
@@ -49,7 +49,7 @@ final class SGIMetadata extends IIOMetadata {
     }
 
     @Override public Node getAsTree(final String formatName) {
-        if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) {
+        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
             return getStandardTree();
         }
         else {
diff --git a/imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java b/imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java
index d2c61588..d78cf8f3 100755
--- a/imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java
+++ b/imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java
@@ -50,7 +50,7 @@ final class TGAMetadata extends IIOMetadata {
     }
 
     @Override public Node getAsTree(final String formatName) {
-        if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) {
+        if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
             return getStandardTree();
         }
         else {