From d8022b8ad31e20f655de9e60b144e5fba7e0b274 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Thu, 13 Oct 2016 15:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B8=83=E5=B1=80=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8=E9=80=A0=E6=88=90=E7=9A=84npe=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_form/src/com/fr/design/mainframe/ComponentTree.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/designer_form/src/com/fr/design/mainframe/ComponentTree.java b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
index 4cf0d2528..2b490e8be 100644
--- a/designer_form/src/com/fr/design/mainframe/ComponentTree.java
+++ b/designer_form/src/com/fr/design/mainframe/ComponentTree.java
@@ -281,6 +281,7 @@ public class ComponentTree extends JTree {
             }
             //绝对布局作为body的时候不显示自适应布局父层
             if (((XCreator) parent).acceptType(XWAbsoluteLayout.class)
+                    && (parent.getParent() != null)
                     && ((XCreator)parent.getParent()).acceptType(XWFitLayout.class)
                     && ((XWAbsoluteLayout)parent).toData().isAbsoluteLayoutAsBody()){
                 parent = parent.getParent().getParent();