Merge pull request arrow-kt#52 from JetBrains/КТ-21795

КТ-21795: check available kotlin version on backend side
dominv · Mar 21, 2018 · a29a9a5 · a29a9a5
2 parents 20e4247 + c6f606a
commit a29a9a5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/kotlin.web.demo.backend/src/main/java/org/jetbrains/webdemo/backend/MyHttpSession.kt b/kotlin.web.demo.backend/src/main/java/org/jetbrains/webdemo/backend/MyHttpSession.kt
@@ -67,7 +67,7 @@ class MyHttpSession {
         var kotlinVersion: String? = null
         try {
             val currentProject = objectMapper.readValue<Project>(request.getParameter("project"))
-            kotlinVersion = currentProject.compilerVersion ?: KotlinWrappersManager.defaultWrapper.wrapperVersion
+            kotlinVersion = getAvailableKotlinVersion(currentProject.compilerVersion)
 
             val wrapper = KotlinWrappersManager.getKotlinWrapper(kotlinVersion)
             if (wrapper == null) {
@@ -197,6 +197,11 @@ class MyHttpSession {
 
     }
 
+    private fun getAvailableKotlinVersion(version: String?): String {
+        val isActualVersion = KotlinWrappersManager.getKotlinVersions().contains(version)
+        return if (isActualVersion && version != null) version else KotlinWrappersManager.defaultWrapper.wrapperVersion
+    }
+
     private fun getFilesContentFromProject(project: Project): Map<String, String> {
         val result = HashMap<String, String>()
         for (file in project.files) {