Merge branch 'master' into racecommittee_integrated

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorJsonSerializer.java

@@ -18,6 +18,10 @@ public class CompetitorJsonSerializer implements JsonSerializer<Competitor> {
   
     private final JsonSerializer<Team> teamJsonSerializer;
 
+    public CompetitorJsonSerializer() {
+        this(null);
+    }
+
     public CompetitorJsonSerializer(JsonSerializer<Team> teamJsonSerializer) {
         this.teamJsonSerializer = teamJsonSerializer;
     }
@@ -33,7 +37,9 @@ public class CompetitorJsonSerializer implements JsonSerializer<Competitor> {
         CountryCode countryCode = competitor.getTeam().getNationality().getCountryCode();
         result.put(FIELD_NATIONALITY_ISO2, countryCode == null ? "" : countryCode.getTwoLetterISOCode());
         result.put(FIELD_NATIONALITY_ISO3, countryCode == null ? "" : countryCode.getThreeLetterISOCode());
-        result.put(FIELD_TEAM, teamJsonSerializer.serialize(competitor.getTeam()));
+        if(teamJsonSerializer != null) {
+            result.put(FIELD_TEAM, teamJsonSerializer.serialize(competitor.getTeam()));
+        }
 
         return result;
     }

java/com.sap.sailing.velum.resultimport/src/com/sap/sailing/velum/resultimport/impl/CsvParserImpl.java

@@ -57,7 +57,7 @@ public class CsvParserImpl implements CsvParser {
         // G-PL;SEGELNR;STEUERMANN/-FRAU/CREW;CLUB;CLUB-ID;1.Wf;1.Wf;2.Wf;2.Wf;3.Wf;3.Wf;4.Wf;4.Wf;5.Wf;5.Wf;6.Wf;6.Wf;7.Wf;7.Wf;G-PKTE;G-PL;
         // 1;GER    951;Zachariassen, Gerd/Winter Hagen/Zachariassen, Cornelia;NRV/NRV/NRV;HA002/HA002/HA002;1;1,00;3;3,00;4;4,00;8;8,00;[11];[11,00];1;1,00;1;1,00;18,00;1;
         
-        BufferedReader br = new BufferedReader(new InputStreamReader(inputStream));
+        BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, "Cp1252"));
         String line = br.readLine();
         int startIndexForRacePoints = -1;
         int endIndexForRacePoints = -1;