From 2e4f1f415aa45dc0a59b0c6ddfb962c57e218945 Mon Sep 17 00:00:00 2001
From: echooymxq <echooy.mxq@gmail.com>
Date: Sun, 18 Aug 2019 21:00:44 +0800
Subject: [PATCH] fix #841 get DubboTransported annotation attributes npe

---
 .../DubboLoadBalancedRestTemplateAutoConfiguration.java  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
index b6f0c84bf..74bb1e38b 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
+++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
@@ -15,10 +15,7 @@
  */
 package com.alibaba.cloud.dubbo.autoconfigure;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.SmartInitializingSingleton;
@@ -148,8 +145,8 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration
 			MethodMetadata factoryMethodMetadata = annotatedBeanDefinition
 					.getFactoryMethodMetadata();
 			attributes = factoryMethodMetadata != null
-					? factoryMethodMetadata
-							.getAnnotationAttributes(DUBBO_TRANSPORTED_CLASS_NAME)
+					? Optional.ofNullable(factoryMethodMetadata
+							.getAnnotationAttributes(DUBBO_TRANSPORTED_CLASS_NAME)).orElse(attributes)
 					: Collections.emptyMap();
 		}
 		return attributesResolver.resolve(attributes);