~chenluhua/Bond2.git

			@@ -111,6 +111,8 @@
			CProcessJob* getProcessJob(const std::string& id);
			int setControlJob(CControlJob& controlJob);
			CLoadPort* getPortWithCarrierId(const std::string& carrierId) const;
			bool saveState() const;
			bool loadState(const std::string& path);

			private:
			inline void lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -196,6 +198,7 @@
			bool m_bEnableAlarmReport;
			SERVO::CControlJob* m_pControlJob;
			std::vector<SERVO::CProcessJob*> m_processJobs;
			std::string m_strStatePath;
			};
			}