Index: trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java	(revision 11330)
+++ trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java	(revision 11331)
@@ -44,5 +44,5 @@
                 return img;
             byte[] content = getContent();
-            if (content != null && content.length > 0) {
+            if (content.length > 0) {
                 img = ImageIO.read(new ByteArrayInputStream(content));
                 imageLoaded = true;
Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java	(revision 11330)
+++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java	(revision 11331)
@@ -196,6 +196,5 @@
             return false;
         }
-        byte[] content = cacheData.getContent();
-        return content != null && content.length > 0;
+        return cacheData.getContent().length > 0;
     }
 
Index: trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java	(revision 11330)
+++ trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java	(revision 11331)
@@ -124,5 +124,5 @@
             byte[] content = cacheData.getContent();
             try {
-                return content != null || cacheData.getImage() != null || isNoTileAtZoom();
+                return content.length > 0 || cacheData.getImage() != null || isNoTileAtZoom();
             } catch (IOException e) {
                 LOG.log(Level.WARNING, "JCS TMS - error loading from cache for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
@@ -325,5 +325,5 @@
         if (object != null) {
             byte[] content = object.getContent();
-            if (content != null && content.length > 0) {
+            if (content.length > 0) {
                 tile.loadImage(new ByteArrayInputStream(content));
                 if (tile.getImage() == null) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java	(revision 11330)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java	(revision 11331)
@@ -490,5 +490,5 @@
         public void actionPerformed(ActionEvent e) {
             int[] mergedRows = mergedEntriesTable.getSelectedRows();
-            if (mergedRows == null || mergedRows.length == 0)
+            if (mergedRows.length == 0)
                 return;
             int[] myRows = myEntriesTable.getSelectedRows();
@@ -520,5 +520,5 @@
         public void actionPerformed(ActionEvent e) {
             int[] mergedRows = mergedEntriesTable.getSelectedRows();
-            if (mergedRows == null || mergedRows.length == 0)
+            if (mergedRows.length == 0)
                 return;
             int[] myRows = myEntriesTable.getSelectedRows();
@@ -582,5 +582,5 @@
         public void actionPerformed(ActionEvent e) {
             int[] mergedRows = mergedEntriesTable.getSelectedRows();
-            if (mergedRows == null || mergedRows.length == 0)
+            if (mergedRows.length == 0)
                 return;
             int[] myRows = theirEntriesTable.getSelectedRows();
@@ -608,5 +608,5 @@
         public void actionPerformed(ActionEvent e) {
             int[] mergedRows = mergedEntriesTable.getSelectedRows();
-            if (mergedRows == null || mergedRows.length == 0)
+            if (mergedRows.length == 0)
                 return;
             int[] myRows = theirEntriesTable.getSelectedRows();
@@ -703,7 +703,5 @@
         public void valueChanged(ListSelectionEvent e) {
             int[] rows = mergedEntriesTable.getSelectedRows();
-            setEnabled(
-                    rows != null
-                    && rows.length > 0
+            setEnabled(rows.length > 0
                     && rows[0] != 0
             );
@@ -737,7 +735,5 @@
         public void valueChanged(ListSelectionEvent e) {
             int[] rows = mergedEntriesTable.getSelectedRows();
-            setEnabled(
-                    rows != null
-                    && rows.length > 0
+            setEnabled(rows.length > 0
                     && rows[rows.length -1] != mergedEntriesTable.getRowCount() -1
             );
@@ -771,8 +767,5 @@
         public void valueChanged(ListSelectionEvent e) {
             int[] rows = mergedEntriesTable.getSelectedRows();
-            setEnabled(
-                    rows != null
-                    && rows.length > 0
-            );
+            setEnabled(rows.length > 0);
         }
     }