commit 2ebff28ac76fb19e2d25e5ddd4885708dfdd5611
author Dave Day <djd@golang.org> Mon Apr 18 12:44:00 2016 +1000
committer David Symonds <dsymonds@golang.org> Tue Apr 19 09:54:22 2016 +1000
tree fe4d7e5ac692b9fcd2e1cb290c22272e1bd9c91f
parent 331aba25e29be6408a842fca779ec9c0526d9409

Correctly set OrigName for oneof fields.

Signed-off-by: David Symonds <dsymonds@golang.org>

proto/properties.go

diff --git a/proto/properties.go b/proto/properties.go
index 4fe2ec2..880eb22 100644
--- a/proto/properties.go
+++ b/proto/properties.go
@@ -701,7 +701,11 @@
 		if f.Name == "XXX_unrecognized" { // special case
 			prop.unrecField = toField(&f)
 		}
-		oneof := f.Tag.Get("protobuf_oneof") != "" // special case
+		oneof := f.Tag.Get("protobuf_oneof") // special case
+		if oneof != "" {
+			// Oneof fields don't use the traditional protobuf tag.
+			p.OrigName = oneof
+		}
 		prop.Prop[i] = p
 		prop.order[i] = i
 		if debug {
@@ -711,7 +715,7 @@
 			}
 			print("\n")
 		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && !oneof {
+		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && oneof == "" {
 			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
 		}
 	}