Merge pull request #600 from ArtisanCloud/revert-599-develop

Matrix-X · web-flow · commit e7857450191e · 2025-01-01T16:41:56.000+08:00
Revert "fix(kernel): call Server.Serve nil pointer fixed"
diff --git a/src/kernel/serverGuard.go b/src/kernel/serverGuard.go
@@ -139,9 +139,7 @@ func (serverGuard *ServerGuard) Serve(request *http.Request) (response *http.Res
 
 	response, err = validatedGuard.Resolve(request)
 
-	if response != nil {
-		logger.Info("Server response created:", "content", response.ContentLength)
-	}
+	logger.Info("Server response created:", "content", response.ContentLength)
 
 	return response, err
 }
@@ -436,7 +434,7 @@ func (serverGuard *ServerGuard) ParseMessage(content string, dataType string) (c
 	callback = &models.Callback{}
 
 	if len(content) <= 0 {
-		return callback, nil
+		return nil, errors.New("request body is empty")
 	}
 
 	if dataType == messages.DataTypeXML {

Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,7 @@ func (serverGuard ServerGuard) Serve(request http.Request) (response *http.Res`
`139`	`139`
`140`	`140`	`response, err = validatedGuard.Resolve(request)`
`141`	`141`
`142`		`- if response != nil {`
`143`		`- logger.Info("Server response created:", "content", response.ContentLength)`
`144`		`- }`
	`142`	`+ logger.Info("Server response created:", "content", response.ContentLength)`
`145`	`143`
`146`	`144`	`return response, err`
`147`	`145`	`}`
`@@ -436,7 +434,7 @@ func (serverGuard *ServerGuard) ParseMessage(content string, dataType string) (c`
`436`	`434`	`callback = &models.Callback{}`
`437`	`435`
`438`	`436`	`if len(content) <= 0 {`
`439`		`- return callback, nil`
	`437`	`+ return nil, errors.New("request body is empty")`
`440`	`438`	`}`
`441`	`439`
`442`	`440`	`if dataType == messages.DataTypeXML {`