From 5433e90036069c4d51d2e6fd2098edfaac5d27e7 Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Mon, 13 Jan 2020 14:20:58 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-26263=20=E5=88=87=E6=8D=A2=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E7=9B=AE=E5=BD=95=E5=88=B0tomcat=EF=BC=8C=E6=94=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=80=E6=AE=B5=E6=97=B6=E9=97=B4=E5=88=87=E5=9B=9E?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=EF=BC=8C=E5=87=BA=E7=8E=B0=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E5=88=87=E6=8D=A2=E6=88=90=E5=8A=9F=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20npe=20=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/JForm.java   |  8 ++++++--
 .../com/fr/design/mainframe/JFormTest.java    | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 designer-form/src/test/java/com/fr/design/mainframe/JFormTest.java

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index a5b76e1fc..ab19002c1 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -543,8 +543,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
      */
     public boolean canUndo() {
         //报表块最多撤销至编辑报表块的第一步，不能撤销表单中的操作
-        boolean inECUndoForm = undoState.getFormReportType() == BaseUndoState.STATE_BEFORE_FORM_REPORT && formDesign.isReportBlockEditing();
-        return !inECUndoForm && this.getUndoManager().canUndo();
+        boolean inECUndoForm = undoState != null
+                && undoState.getFormReportType() == BaseUndoState.STATE_BEFORE_FORM_REPORT
+                && formDesign.isReportBlockEditing();
+        return !inECUndoForm
+                && this.getUndoManager() != null
+                && this.getUndoManager().canUndo();
     }
 
     // 返回当前的body，
diff --git a/designer-form/src/test/java/com/fr/design/mainframe/JFormTest.java b/designer-form/src/test/java/com/fr/design/mainframe/JFormTest.java
new file mode 100644
index 000000000..f419ef720
--- /dev/null
+++ b/designer-form/src/test/java/com/fr/design/mainframe/JFormTest.java
@@ -0,0 +1,20 @@
+package com.fr.design.mainframe;
+
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class JFormTest {
+    
+    @Test
+    public void testRun() {
+    
+        JForm mockForm = EasyMock.partialMockBuilder(JForm.class).addMockedMethod("getUndoManager").createMock();
+        try {
+            mockForm.canUndo();
+        } catch (Exception e) {
+            Assert.fail();
+        }
+    }
+    
+}
\ No newline at end of file