Merge pull request #18487 from smarterclayton/guard_encode_decode

Auto commit by PR queue bot
2015-12-13 23:08:18 -08:00
parent 9067833a31 1e21054134
commit 266ab4a796
25 changed files with 103 additions and 81 deletions
--- a/examples/examples_test.go
+++ b/examples/examples_test.go
@@ -430,7 +430,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 				if err != nil {
 					t.Errorf("Could not get codec for %s: %s", expectedType, err)
 				}
-				if err := codec.DecodeInto(data, expectedType); err != nil {
+				if err := runtime.DecodeInto(codec, data, expectedType); err != nil {
 					t.Errorf("%s did not decode correctly: %v\n%s", path, err, string(data))
 					return
 				}