You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/04/10 11:19:40 UTC
thrift git commit: Revert "THRIFT-3746 JSON protocol left in
incorrect state on read errors"
Repository: thrift
Updated Branches:
refs/heads/master 8b0b7e5eb -> 3aa461b97
Revert "THRIFT-3746 JSON protocol left in incorrect state on read errors"
This reverts commit 51850abb7ed0a7304f60cbced853285c9b63f4cb.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/3aa461b9
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/3aa461b9
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/3aa461b9
Branch: refs/heads/master
Commit: 3aa461b97b3230d357543808f1facf9898818f71
Parents: 8b0b7e5
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Sat Apr 9 19:46:21 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sun Apr 10 18:18:10 2016 +0900
----------------------------------------------------------------------
lib/go/thrift/json_protocol.go | 11 +++++-----
lib/go/thrift/simple_json_protocol.go | 35 ++++++++++++++++++------------
2 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/3aa461b9/lib/go/thrift/json_protocol.go
----------------------------------------------------------------------
diff --git a/lib/go/thrift/json_protocol.go b/lib/go/thrift/json_protocol.go
index e24d065..442fa91 100644
--- a/lib/go/thrift/json_protocol.go
+++ b/lib/go/thrift/json_protocol.go
@@ -60,8 +60,7 @@ func NewTJSONProtocolFactory() *TJSONProtocolFactory {
}
func (p *TJSONProtocol) WriteMessageBegin(name string, typeId TMessageType, seqId int32) error {
- p.resetContextStack()
- p.writer.Reset(p.trans)
+ p.resetContextStack() // THRIFT-3735
if e := p.OutputListBegin(); e != nil {
return e
}
@@ -204,17 +203,18 @@ func (p *TJSONProtocol) WriteBinary(v []byte) error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_QUOTE_BYTES); e != nil {
+ if _, e := p.write(JSON_QUOTE_BYTES); e != nil {
return NewTProtocolException(e)
}
writer := base64.NewEncoder(base64.StdEncoding, p.writer)
if _, e := writer.Write(v); e != nil {
+ p.writer.Reset(p.trans) // THRIFT-3735
return NewTProtocolException(e)
}
if e := writer.Close(); e != nil {
return NewTProtocolException(e)
}
- if _, e := p.writer.Write(JSON_QUOTE_BYTES); e != nil {
+ if _, e := p.write(JSON_QUOTE_BYTES); e != nil {
return NewTProtocolException(e)
}
return p.OutputPostValue()
@@ -222,8 +222,7 @@ func (p *TJSONProtocol) WriteBinary(v []byte) error {
// Reading methods.
func (p *TJSONProtocol) ReadMessageBegin() (name string, typeId TMessageType, seqId int32, err error) {
- p.resetContextStack()
- p.reader.Reset(p.trans)
+ p.resetContextStack() // THRIFT-3735
if isNull, err := p.ParseListBegin(); isNull || err != nil {
return name, typeId, seqId, err
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/3aa461b9/lib/go/thrift/simple_json_protocol.go
----------------------------------------------------------------------
diff --git a/lib/go/thrift/simple_json_protocol.go b/lib/go/thrift/simple_json_protocol.go
index c746f8c..7353322 100644
--- a/lib/go/thrift/simple_json_protocol.go
+++ b/lib/go/thrift/simple_json_protocol.go
@@ -156,8 +156,7 @@ func mismatch(expected, actual string) error {
}
func (p *TSimpleJSONProtocol) WriteMessageBegin(name string, typeId TMessageType, seqId int32) error {
- p.resetContextStack()
- p.writer.Reset(p.trans)
+ p.resetContextStack() // THRIFT-3735
if e := p.OutputListBegin(); e != nil {
return e
}
@@ -271,17 +270,18 @@ func (p *TSimpleJSONProtocol) WriteBinary(v []byte) error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_QUOTE_BYTES); e != nil {
+ if _, e := p.write(JSON_QUOTE_BYTES); e != nil {
return NewTProtocolException(e)
}
writer := base64.NewEncoder(base64.StdEncoding, p.writer)
if _, e := writer.Write(v); e != nil {
+ p.writer.Reset(p.trans) // THRIFT-3735
return NewTProtocolException(e)
}
if e := writer.Close(); e != nil {
return NewTProtocolException(e)
}
- if _, e := p.writer.Write(JSON_QUOTE_BYTES); e != nil {
+ if _, e := p.write(JSON_QUOTE_BYTES); e != nil {
return NewTProtocolException(e)
}
return p.OutputPostValue()
@@ -289,8 +289,7 @@ func (p *TSimpleJSONProtocol) WriteBinary(v []byte) error {
// Reading methods.
func (p *TSimpleJSONProtocol) ReadMessageBegin() (name string, typeId TMessageType, seqId int32, err error) {
- p.resetContextStack()
- p.reader.Reset(p.trans)
+ p.resetContextStack() // THRIFT-3735
if isNull, err := p.ParseListBegin(); isNull || err != nil {
return name, typeId, seqId, err
}
@@ -569,12 +568,12 @@ func (p *TSimpleJSONProtocol) OutputPreValue() error {
cxt := _ParseContext(p.dumpContext[len(p.dumpContext)-1])
switch cxt {
case _CONTEXT_IN_LIST, _CONTEXT_IN_OBJECT_NEXT_KEY:
- if _, e := p.writer.Write(JSON_COMMA); e != nil {
+ if _, e := p.write(JSON_COMMA); e != nil {
return NewTProtocolException(e)
}
break
case _CONTEXT_IN_OBJECT_NEXT_VALUE:
- if _, e := p.writer.Write(JSON_COLON); e != nil {
+ if _, e := p.write(JSON_COLON); e != nil {
return NewTProtocolException(e)
}
break
@@ -630,7 +629,7 @@ func (p *TSimpleJSONProtocol) OutputNull() error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_NULL); e != nil {
+ if _, e := p.write(JSON_NULL); e != nil {
return NewTProtocolException(e)
}
return p.OutputPostValue()
@@ -688,7 +687,7 @@ func (p *TSimpleJSONProtocol) OutputString(s string) error {
}
func (p *TSimpleJSONProtocol) OutputStringData(s string) error {
- _, e := p.writer.Write([]byte(s))
+ _, e := p.write([]byte(s))
return NewTProtocolException(e)
}
@@ -696,7 +695,7 @@ func (p *TSimpleJSONProtocol) OutputObjectBegin() error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_LBRACE); e != nil {
+ if _, e := p.write(JSON_LBRACE); e != nil {
return NewTProtocolException(e)
}
p.dumpContext = append(p.dumpContext, int(_CONTEXT_IN_OBJECT_FIRST))
@@ -704,7 +703,7 @@ func (p *TSimpleJSONProtocol) OutputObjectBegin() error {
}
func (p *TSimpleJSONProtocol) OutputObjectEnd() error {
- if _, e := p.writer.Write(JSON_RBRACE); e != nil {
+ if _, e := p.write(JSON_RBRACE); e != nil {
return NewTProtocolException(e)
}
p.dumpContext = p.dumpContext[:len(p.dumpContext)-1]
@@ -718,7 +717,7 @@ func (p *TSimpleJSONProtocol) OutputListBegin() error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_LBRACKET); e != nil {
+ if _, e := p.write(JSON_LBRACKET); e != nil {
return NewTProtocolException(e)
}
p.dumpContext = append(p.dumpContext, int(_CONTEXT_IN_LIST_FIRST))
@@ -726,7 +725,7 @@ func (p *TSimpleJSONProtocol) OutputListBegin() error {
}
func (p *TSimpleJSONProtocol) OutputListEnd() error {
- if _, e := p.writer.Write(JSON_RBRACKET); e != nil {
+ if _, e := p.write(JSON_RBRACKET); e != nil {
return NewTProtocolException(e)
}
p.dumpContext = p.dumpContext[:len(p.dumpContext)-1]
@@ -1328,3 +1327,11 @@ func (p *TSimpleJSONProtocol) resetContextStack() {
p.parseContextStack = []int{int(_CONTEXT_IN_TOPLEVEL)}
p.dumpContext = []int{int(_CONTEXT_IN_TOPLEVEL)}
}
+
+func (p *TSimpleJSONProtocol) write(b []byte) (int, error) {
+ n, err := p.writer.Write(b)
+ if err != nil {
+ p.writer.Reset(p.trans) // THRIFT-3735
+ }
+ return n, err
+}