From 1fa2f7b9799e32da7b53e1f1c88cb17ce503ff70 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
---
.../fr/soleil/docking/infonode/InfoNodeDockingManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dockinginfonode/src/main/java/fr/soleil/docking/infonode/InfoNodeDockingManager.java b/dockinginfonode/src/main/java/fr/soleil/docking/infonode/InfoNodeDockingManager.java
index 5d54411..0bff908 100644
--- a/dockinginfonode/src/main/java/fr/soleil/docking/infonode/InfoNodeDockingManager.java
+++ b/dockinginfonode/src/main/java/fr/soleil/docking/infonode/InfoNodeDockingManager.java
@@ -97,7 +97,8 @@ public class InfoNodeDockingManager extends ADockingManager {
@Override
public void applyPerspective(IPerspective perspective, JComponent dockingArea) throws DockingException {
DockingException dockingException = null;
- if ((perspective != null) && (perspective.getByteArray().length > 0) && (dockingArea instanceof RootWindow)) {
+ if ((perspective != null) && (perspective.getByteArray() != null) && (perspective.getByteArray().length > 0)
+ && (dockingArea instanceof RootWindow)) {
RootWindow rootWindow = (RootWindow) dockingArea;
ObjectInputStream ois = null;
ByteArrayInputStream bais = null;
--
GitLab