From bfe4b93179aafde7ea3885a7e70d53b96cd09cec Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 17 Jan 2022 18:06:52 +0100
Subject: [PATCH] Cleanup version determination in CustomRuntimeEventLoop

---
 .../function/adapter/aws/CustomRuntimeEventLoop.java      | 8 +++++++-
 .../function-sample-kotlin-web/pom.xml                    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java
index 83d9f256d..42d6e2fce 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java
@@ -236,6 +236,12 @@ public final class CustomRuntimeEventLoop implements SmartLifecycle {
 			return "UNKNOWN-VERSION";
 		}
 		int startIndex = path.lastIndexOf("/") + 1;
-		return path.substring(startIndex, endIndex).replace("spring-cloud-function-adapter-aws-", "");
+		try {
+			return path.substring(startIndex, endIndex).replace("spring-cloud-function-adapter-aws-", "");
+		}
+		catch (Throwable e) {
+			logger.info("Failed to deterimine framework version");
+			return "UNKNOWN-VERSION";
+		}
 	}
 }
diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
index b80bfa41f..4c3587eff 100644
--- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
+++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-kotlin</artifactId>
-			<version>3.2.1-SNAPSHOT</version>
+			<version>3.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>