address NPE

Miguel Gonzalez Sanchez · Miguel Gonzalez Sanchez · commit a4bf9eb8a07f · 2021-11-24T15:37:51.000Z
diff --git a/grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/autoconfigure/OnMissingErrorHandlerCondition.java b/grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/autoconfigure/OnMissingErrorHandlerCondition.java
@@ -52,9 +52,10 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
     private String getBeanClassName(BeanDefinition beanDefinition) {
         if (beanDefinition instanceof AnnotatedBeanDefinition) {
             MethodMetadata factoryMethodMetadata = ((AnnotatedBeanDefinition) beanDefinition).getFactoryMethodMetadata();
-            return factoryMethodMetadata.getReturnTypeName();
-        } else {
-            return beanDefinition.getBeanClassName();
+            if (factoryMethodMetadata != null) {
+                return factoryMethodMetadata.getReturnTypeName();
+            }
         }
+        return beanDefinition.getBeanClassName();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,10 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM`
`52`	`52`	`private String getBeanClassName(BeanDefinition beanDefinition) {`
`53`	`53`	`if (beanDefinition instanceof AnnotatedBeanDefinition) {`
`54`	`54`	`MethodMetadata factoryMethodMetadata = ((AnnotatedBeanDefinition) beanDefinition).getFactoryMethodMetadata();`
`55`		`- return factoryMethodMetadata.getReturnTypeName();`
`56`		`- } else {`
`57`		`- return beanDefinition.getBeanClassName();`
	`55`	`+ if (factoryMethodMetadata != null) {`
	`56`	`+ return factoryMethodMetadata.getReturnTypeName();`
	`57`	`+ }`
`58`	`58`	`}`
	`59`	`+ return beanDefinition.getBeanClassName();`
`59`	`60`	`}`
`60`	`61`	`}`