Explorar el Código

Clean up error handling

Mike Kaminski hace 7 años
padre
commit
56ffac20e5
Se han modificado 3 ficheros con 6 adiciones y 19 borrados
  1. 1 5
      broker.go
  2. 3 10
      sasl_authenticate_request.go
  3. 2 4
      sasl_authenticate_response.go

+ 1 - 5
broker.go

@@ -998,11 +998,7 @@ func (b *Broker) sendSASLOAuthBearerClientResponse(bearerToken string, extension
 
 	bytesWritten, err := b.conn.Write(buf)
 
-	if err != nil {
-		return 0, err
-	}
-
-	return bytesWritten, nil
+	return bytesWritten, err
 }
 
 func (b *Broker) receiveSASLOAuthBearerServerResponse(correlationID int32) (int, error) {

+ 3 - 10
sasl_authenticate_request.go

@@ -8,19 +8,12 @@ type SaslAuthenticateRequest struct {
 const APIKeySASLAuth = 36
 
 func (r *SaslAuthenticateRequest) encode(pe packetEncoder) error {
-	if err := pe.putBytes(r.SaslAuthBytes); err != nil {
-		return err
-	}
-
-	return nil
+	return pe.putBytes(r.SaslAuthBytes)
 }
 
 func (r *SaslAuthenticateRequest) decode(pd packetDecoder, version int16) (err error) {
-	if r.SaslAuthBytes, err = pd.getBytes(); err != nil {
-		return err
-	}
-
-	return nil
+	r.SaslAuthBytes, err = pd.getBytes()
+	return err
 }
 
 func (r *SaslAuthenticateRequest) key() int16 {

+ 2 - 4
sasl_authenticate_response.go

@@ -26,11 +26,9 @@ func (r *SaslAuthenticateResponse) decode(pd packetDecoder, version int16) error
 		return err
 	}
 
-	if r.SaslAuthBytes, err = pd.getBytes(); err != nil {
-		return err
-	}
+	r.SaslAuthBytes, err = pd.getBytes()
 
-	return nil
+	return err
 }
 
 func (r *SaslAuthenticateResponse) key() int16 {