github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

renamed ErrObjectReleased

pull/215/head
v2ray 2016-06-22 15:12:57 +02:00
parent 3729ad2330
commit 6847139ae3
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/common.go
View File

@ -7,8 +7,8 @@ import (
)
var (
ErrorAlreadyReleased = errors.New("Object already released.")
ErrBadConfiguration = errors.New("Bad configuration.")
ErrObjectReleased = errors.New("Object already released.")
ErrBadConfiguration = errors.New("Bad configuration.")
)
// Releasable interface is for those types that can release its members.

4
common/crypto/io.go
View File

@ -21,7 +21,7 @@ func NewCryptionReader(stream cipher.Stream, reader io.Reader) *CryptionReader {
func (this *CryptionReader) Read(data []byte) (int, error) {
if this.reader == nil {
return 0, common.ErrorAlreadyReleased
return 0, common.ErrObjectReleased
}
nBytes, err := this.reader.Read(data)
if nBytes > 0 {
@ -49,7 +49,7 @@ func NewCryptionWriter(stream cipher.Stream, writer io.Writer) *CryptionWriter {
func (this *CryptionWriter) Write(data []byte) (int, error) {
if this.writer == nil {
return 0, common.ErrorAlreadyReleased
return 0, common.ErrObjectReleased
}
this.stream.XORKeyStream(data, data)
return this.writer.Write(data)