Merge branch 'master' of https://github.com/duanhf2012/Origin

service/servicemanager.go

@@ -98,7 +98,11 @@ func (slf *CServiceManager) GenServiceID() int {
 }
 
 func (slf *CServiceManager) GetLogger() ILogger {
-	return slf.logger
+	ret := slf.logger
+	if ret == nil {
+		ret = defaultLogger
+	}
+	return ret
 }
 
 var self *CServiceManager