Merge branch 'release/v0.6.22-alpha'

FAForever · Aug 21, 2016 · 7a264fa · 7a264fa
2 parents e5b830c + 4d02fac
commit 7a264fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,7 @@ apply plugin: 'distribution'
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-version = '0.6.21-alpha'
+version = '0.6.22-alpha'
 
 class HttpBuilder extends HTTPBuilder {
 

diff --git a/downlords-faf-client.install4j b/downlords-faf-client.install4j
@@ -470,7 +470,7 @@
     </applications>
   </installerGui>
   <mediaSets>
-    <windows name="Windows" id="26" customizedId="" mediaFileName="" installDir="${compiler:sys.fullName}" overridePrincipalLanguage="false" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-x86-1.8.0_102" manualJREEntry="false" bundleType="2" jreURL="https://github.com/micheljung/jre-bundles/blob/master/windows-x86-1.8.0_102.tar.gz" jreShared="false" directDownload="true" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
+    <windows name="Windows" id="26" customizedId="" mediaFileName="" installDir="${compiler:sys.fullName}" overridePrincipalLanguage="false" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-x86-1.8.0_102" manualJREEntry="false" bundleType="2" jreURL="https://github.com/micheljung/jre-bundles/raw/master/windows-x86-1.8.0_102.tar.gz" jreShared="true" directDownload="false" installOnlyIfNecessary="true" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
       <excludedComponents />
       <includedDownloadableComponents />
       <excludedLaunchers />

diff --git a/src/main/java/com/faforever/client/game/GameInfoBean.java b/src/main/java/com/faforever/client/game/GameInfoBean.java
@@ -148,11 +148,15 @@ private int parseRating(String string) {
     } catch (NumberFormatException e) {
       int rating;
       String[] split = string.replace("k", "").split("\\.");
-      rating = Integer.parseInt(split[0]) * 1000;
-      if (split.length == 2) {
-        rating += Integer.parseInt(split[1]) * 100;
+      try {
+        rating = Integer.parseInt(split[0]) * 1000;
+        if (split.length == 2) {
+          rating += Integer.parseInt(split[1]) * 100;
+        }
+        return rating;
+      } catch (NumberFormatException e1) {
+        return Integer.MAX_VALUE;
       }
-      return rating;
     }
   }
 

diff --git a/src/main/java/com/faforever/client/map/MapUploadTask.java b/src/main/java/com/faforever/client/map/MapUploadTask.java
@@ -74,7 +74,7 @@ protected Void call() throws Exception {
             .zip();
       }
 
-      logger.debug("Uploading map {}", mapPath, tmpFile);
+      logger.debug("Uploading map {} as {}", mapPath, tmpFile);
       updateTitle(i18n.get("mapVault.upload.uploading"));
 
       fafApiAccessor.uploadMap(tmpFile, isRanked, byteListener);