From cbad2b8e3a3ccf85eb865b32ca8a2568d74149af Mon Sep 17 00:00:00 2001 From: Raphael Girardot <raphael.girardot@synchrotron-soleil.fr> Date: Fri, 16 May 2014 11:35:34 +0000 Subject: [PATCH] NullPointerException avoided --- .../main/java/fr/soleil/docking/vl/VlDockDockingManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockingvl/src/main/java/fr/soleil/docking/vl/VlDockDockingManager.java b/dockingvl/src/main/java/fr/soleil/docking/vl/VlDockDockingManager.java index abc1ff3..7038ca4 100644 --- a/dockingvl/src/main/java/fr/soleil/docking/vl/VlDockDockingManager.java +++ b/dockingvl/src/main/java/fr/soleil/docking/vl/VlDockDockingManager.java @@ -86,7 +86,7 @@ public class VlDockDockingManager extends ADockingManager { @Override public void applyPerspective(IPerspective perspective, JComponent dockingArea) throws DockingException { DockingException dockingException = null; - if ((perspective != null) && (perspective.getByteArray().length > 0) + if ((perspective != null) && (perspective.getByteArray() != null) && (perspective.getByteArray().length > 0) && (dockingArea instanceof SoleilDockingDesktop)) { SoleilDockingDesktop mainDockingDesktop = (SoleilDockingDesktop) dockingArea; InputStream ois = null; -- GitLab