Merge pull request #879 in BA/design from ~NEIL/design:master to master

* commit 'f0fcb3fc95becbcaa447aaf0e15a3940e8d50970':
  1
  无JIRA任务， 合代码漏了个NPE

designer_base/src/com/fr/design/mainframe/loghandler/LogHandlerBar.java

@@ -1,24 +1,16 @@
 package com.fr.design.mainframe.loghandler;
 
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.awt.ItemSelectable;
-import java.awt.LayoutManager;
+import com.fr.base.BaseUtils;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.Timer;
-
-import com.fr.base.BaseUtils;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.general.Inter;
-
 public class LogHandlerBar extends JPanel implements ItemSelectable {
 
 	private static final long serialVersionUID = 1L;
@@ -116,6 +108,9 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 		};
 		if (timer != null) {
 			timer.addActionListener(taskAction);
+		}
+		// taskAction里还有可能置空timer.
+		if (timer != null) {
 			timer.start();
 		}
 	}