From ca0b8ba98285ad7a9564052d4f0c93ee43dbfa43 Mon Sep 17 00:00:00 2001
From: andrew shan <45474304+andrewshan@users.noreply.github.com>
Date: Fri, 10 May 2024 14:32:21 +0800
Subject: [PATCH] fix: fix npe when add circuitbreak module without
 feign.hystrix.enable=true (#1292)

---
 CHANGELOG.md                                  |  3 +-
 ...sFeignCircuitBreakerInvocationHandler.java | 59 ++++++++++---------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f925d3b3f..48d92ae6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,4 +9,5 @@
 - [feat:add polaris ThreadLocal plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1255)
 - [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1257)
 - [fix:fix wrong report when using Zuul with instance not found exception.](https://github.com/Tencent/spring-cloud-tencent/pull/1283)
-- [feat: merge lane router and lossless features from 2023](https://github.com/Tencent/spring-cloud-tencent/pull/1288)
\ No newline at end of file
+- [feat: merge lane router and lossless features from 2023](https://github.com/Tencent/spring-cloud-tencent/pull/1288)
+- [fix: fix npe when add circuitbreak module without feign.hystrix.enable=true](https://github.com/Tencent/spring-cloud-tencent/pull/1292)
\ No newline at end of file
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java
index b8419a29c..0379c9977 100644
--- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisFeignCircuitBreakerInvocationHandler.java
@@ -113,36 +113,41 @@ public class PolarisFeignCircuitBreakerInvocationHandler implements InvocationHa
 		else if ("toString".equals(method.getName())) {
 			return toString();
 		}
-
-		String circuitName = circuitBreakerNameResolver.resolveCircuitBreakerName(feignClientName, target, method);
-		CircuitBreaker circuitBreaker = factory.create(circuitName);
 		Supplier<Object> supplier = asSupplier(method, args);
-		Function<Throwable, Object> fallbackFunction;
-		if (this.nullableFallbackFactory != null) {
-			fallbackFunction = throwable -> {
-				Object fallback = this.nullableFallbackFactory.create(throwable);
-				try {
-					return this.fallbackMethodMap.get(method).invoke(fallback, args);
-				}
-				catch (Exception exception) {
-					unwrapAndRethrow(exception);
-				}
-				return null;
-			};
+		if (circuitBreakerNameResolver != null) {
+			String circuitName = circuitBreakerNameResolver.resolveCircuitBreakerName(feignClientName, target, method);
+			CircuitBreaker circuitBreaker = factory.create(circuitName);
+
+			Function<Throwable, Object> fallbackFunction;
+			if (this.nullableFallbackFactory != null) {
+				fallbackFunction = throwable -> {
+					Object fallback = this.nullableFallbackFactory.create(throwable);
+					try {
+						return this.fallbackMethodMap.get(method).invoke(fallback, args);
+					}
+					catch (Exception exception) {
+						unwrapAndRethrow(exception);
+					}
+					return null;
+				};
+			}
+			else {
+				fallbackFunction = throwable -> {
+					PolarisCircuitBreakerFallbackFactory.DefaultFallback fallback =
+							(PolarisCircuitBreakerFallbackFactory.DefaultFallback) new PolarisCircuitBreakerFallbackFactory(this.decoder).create(throwable);
+					return fallback.fallback(method);
+				};
+			}
+			try {
+				return circuitBreaker.run(supplier, fallbackFunction);
+			}
+			catch (FallbackWrapperException e) {
+				// unwrap And Rethrow
+				throw e.getCause();
+			}
 		}
 		else {
-			fallbackFunction = throwable -> {
-				PolarisCircuitBreakerFallbackFactory.DefaultFallback fallback =
-						(PolarisCircuitBreakerFallbackFactory.DefaultFallback) new PolarisCircuitBreakerFallbackFactory(this.decoder).create(throwable);
-				return fallback.fallback(method);
-			};
-		}
-		try {
-			return circuitBreaker.run(supplier, fallbackFunction);
-		}
-		catch (FallbackWrapperException e) {
-			// unwrap And Rethrow
-			throw e.getCause();
+			return supplier.get();
 		}
 	}