From: Jake Farrell <jfarrell@apache.org>
Date: Mon, 19 Sep 2011 23:38:39 +0000 (+0000)
Subject: THRIFT-1350: Go library code does not build against latest release
X-Git-Tag: 0.8.0~80
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=7e3b866a3558411e99986144061339c21f6125c0;p=common%2Fthrift.git

THRIFT-1350: Go library code does not build against latest release
Client: go
Patch: Kyle Consalus

Go has moved it's URL-handling code into a "url" package, patch updates for these new changes.



git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1172901 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/go/thrift/thttp_client.go b/lib/go/thrift/thttp_client.go
index 08dd9ce9..2ec4b28e 100644
--- a/lib/go/thrift/thttp_client.go
+++ b/lib/go/thrift/thttp_client.go
@@ -24,12 +24,13 @@ import (
   "http"
   "os"
   "strconv"
+  "url"
 )
 
 
 type THttpClient struct {
   response           *http.Response
-  url                *http.URL
+  url                *url.URL
   requestBuffer      *bytes.Buffer
   nsecConnectTimeout int64
   nsecReadTimeout    int64
@@ -69,20 +70,20 @@ func NewTHttpPostClientTransportFactory(url string) *THttpClientTransportFactory
 }
 
 
-func NewTHttpClient(url string) (TTransport, os.Error) {
-  parsedURL, err := http.ParseURL(url)
+func NewTHttpClient(urlstr string) (TTransport, os.Error) {
+  parsedURL, err := url.Parse(urlstr)
   if err != nil {
     return nil, err
   }
-  response, err := http.Get(url)
+  response, err := http.Get(urlstr)
   if err != nil {
     return nil, err
   }
   return &THttpClient{response: response, url: parsedURL}, nil
 }
 
-func NewTHttpPostClient(url string) (TTransport, os.Error) {
-  parsedURL, err := http.ParseURL(url)
+func NewTHttpPostClient(urlstr string) (TTransport, os.Error) {
+  parsedURL, err := url.Parse(urlstr)
   if err != nil {
     return nil, err
   }
diff --git a/lib/go/thrift/tsimple_json_protocol_test.go b/lib/go/thrift/tsimple_json_protocol_test.go
index e57d55bb..f6f5f489 100644
--- a/lib/go/thrift/tsimple_json_protocol_test.go
+++ b/lib/go/thrift/tsimple_json_protocol_test.go
@@ -578,7 +578,7 @@ func TestWriteSimpleJSONProtocolMap(t *testing.T) {
   if str[0] != '[' || str[len(str)-1] != ']' {
     t.Fatalf("Bad value for %s, wrote: %q, in go: %q", thetype, str, DOUBLE_VALUES)
   }
-  l := strings.Split(str[1:len(str)-1], ",", -1)
+  l := strings.Split(str[1:len(str)-1], ",")
   if len(l) < 3 {
     t.Fatal("Expected list of at least length 3 for map for metadata, but was of length ", len(l))
   }