Fixed bug in #getCurrentCountry(iso3) loop

src/main/java/org/genesys2/server/service/impl/GeoServiceImpl.java

@@ -86,7 +86,7 @@ public class GeoServiceImpl implements GeoService {
 		Country.sort(countries, locale);
 		return countries;
 	}
-	
+
 	@Override
 	public long countActive() {
 		return countryRepository.countByCurrent(true);
@@ -172,16 +172,17 @@ public class GeoServiceImpl implements GeoService {
 
 		Country country = getCountry(code3);
 
-		if (country != null) {
+		if (country != null && country.getReplacedBy() != null) {
 			// Loop detection
 			Set<Long> seenCountryId = new HashSet<Long>();
 			while (!seenCountryId.contains(country.getId()) && country.getReplacedBy() != null) {
 				LOG.info("Country " + country.getCode3() + " replaced by " + country.getReplacedBy());
 
-				// Update reference
-				country = country.getReplacedBy();
 				// Put countryId to seen list
 				seenCountryId.add(country.getId());
+
+				// Update reference
+				country = country.getReplacedBy();
 			}
 		}
 
@@ -401,7 +402,7 @@ public class GeoServiceImpl implements GeoService {
 
 		return itpgrfaRepository.save(itpgrfaStatus);
 	}
-	
+
 	@Override
 	public String filteredKml(String jsonFilter) {
 		return null;