[openrtm-commit:00959] r397 - in branches/RELENG_1_1/rtmtools: . jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-01-31 17:44:58 +0900 (Thu, 31 Jan 2013)
New Revision: 397

Modified:
   branches/RELENG_1_1/rtmtools/
   branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/RTSystemEditorPlugin.java
Log:
merged r395-396


Property changes on: branches/RELENG_1_1/rtmtools
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/rtmtools:166-393
   + /trunk/rtmtools:166-393,395-396

Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/RTSystemEditorPlugin.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/RTSystemEditorPlugin.java	2013-01-31 07:17:29 UTC (rev 396)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/RTSystemEditorPlugin.java	2013-01-31 08:44:58 UTC (rev 397)
@@ -23,7 +23,7 @@
 	// The shared instance
 	private static RTSystemEditorPlugin plugin;
 
-	RTSELogHandler logHandler;
+	RTSELogHandler logHandler = null;
 
 	/**
 	 * The constructor
@@ -44,7 +44,9 @@
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
 	public void start(BundleContext context) throws Exception {
-		logHandler.start();
+		if(logHandler!=null) {
+			logHandler.start();
+		}
 		//
 		super.start(context);
 	}
@@ -54,7 +56,9 @@
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
 	public void stop(BundleContext context) throws Exception {
-		logHandler.stop();
+		if(logHandler!=null) {
+			logHandler.stop();
+		}
 		//
 		plugin = null;
 		super.stop(context);
@@ -106,8 +110,8 @@
 		return result;
 	}
 
-	static LogManager logManager;
-	static Logger log;
+	static LogManager logManager = null;
+	static Logger log = null;
 
 	public static Logger getLogger() {
 		if (logManager == null) {