/**
 * Copyright (C) FuseSource, Inc.
 * http://fusesource.com
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *    http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.fusesource.fabric.internal;

import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;

import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;

/**
 */
public class GeoUtils {
    /**
     * Get the geographical location (latitude,longitude)
     * @return  String containing the geolocation - or an empty string on failure
     */
    public static String getGeoLocation() {
        final String LATITUDE = "latitude";
        final String LONGITUDE = "longitude";
        String result = "";

        try {
            String urlStr =  "http://freegeoip.net/json/";
            URL url = new URL(urlStr);
            URLConnection urlConnection = url.openConnection();
            BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
            String inputLine;
            String temp = "";
            while ((inputLine = in.readLine()) != null) {
                temp += inputLine;
            }

            if (temp != null && !temp.isEmpty()){
                ObjectMapper mapper = new ObjectMapper();
                JsonNode node = mapper.readValue(temp,JsonNode.class);
                JsonNode latitudeNode = node.get(LATITUDE);
                JsonNode longitudeNode = node.get(LONGITUDE);
                if (latitudeNode != null && longitudeNode != null){
                    result = latitudeNode.toString() + "," + longitudeNode.toString();
                }
            }
        }catch(Exception e) {
            //this is going to fail if using this offline
        }
        return result;
    }
}

@@ -1384,24 +1384,124 @@
 nnection();%0A
+            urlConnection.setConnectTimeout(50000);%0A            urlConnection.setReadTimeout(5000);%0A
             

Add a timeout to GeoUtils to prevent waiting forever if something goes wrong.