avoid nil checks

randomNone1 · Aug 18, 2015 · 4b782e9 · 4b782e9
1 parent 34e978c
commit 4b782e9
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/github.com/getlantern/flashlight/geolookup/geolookup.go b/src/github.com/getlantern/flashlight/geolookup/geolookup.go
@@ -36,19 +36,11 @@ var (
 )
 
 func GetIp() string {
-	c := ip.Load()
-	if c == nil {
-		return ""
-	}
-	return c.(string)
+	return ip.Load().(string)
 }
 
 func GetCountry() string {
-	c := country.Load()
-	if c == nil {
-		return ""
-	}
-	return c.(string)
+	return country.Load().(string)
 }
 
 // Configure configures geolookup to use the given http.Client to perform
@@ -59,6 +51,10 @@ func Configure(newClient *http.Client) {
 	cfgMutex.Lock()
 	defer cfgMutex.Unlock()
 
+	// Avoid annoying checks for nil later.
+	ip.Store("")
+	country.Store("")
+
 	client.Store(newClient)
 
 	if service == nil {