small correction - if image from transferObject is null, methode can return

1 files changed, 8 insertions, 4 deletions

diff --git a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/SwingUtility.java b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/SwingUtility.java
index 25431ca0ed..9d4e446ed4 100644
--- a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/SwingUtility.java
+++ b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/SwingUtility.java
@@ -334,11 +334,15 @@ public final class SwingUtility {
     else if (scoutT instanceof ImageTransferObject) {

       ImageTransferObject imgTransferObject = (ImageTransferObject) scoutT;

       Image img = null;

-      if (imgTransferObject.getImage() instanceof Image) {

-        img = (Image) imgTransferObject.getImage();

+      Object image = imgTransferObject.getImage();

+      if (image == null) {

+        return null;

       }

-      else if (imgTransferObject.getImage() instanceof byte[]) {

-        img = Toolkit.getDefaultToolkit().createImage((byte[]) imgTransferObject.getImage());

+      else if (image instanceof Image) {

+        img = (Image) image;

+      }

+      else if (image instanceof byte[]) {

+        img = Toolkit.getDefaultToolkit().createImage((byte[]) image);

       }

       if (img != null) {

         return new AwtImageTransferable(img);