Fixed handling of @resource's shareable value

jhoeller · jhoeller · commit 0a318924752a · 2013-09-25T13:04:50.000+02:00
Issue: SPR-10931 (cherry picked from commit 7bc3e3b)
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -472,11 +472,8 @@ protected abstract class LookupElement extends InjectionMetadata.InjectedElement
 
 		public LookupElement(Member member, PropertyDescriptor pd) {
 			super(member, pd);
-			initAnnotation((AnnotatedElement) member);
 		}
 
-		protected abstract void initAnnotation(AnnotatedElement ae);
-
 		/**
 		 * Return the resource name for the lookup.
 		 */
@@ -511,14 +508,11 @@ public final DependencyDescriptor getDependencyDescriptor() {
 	 */
 	private class ResourceElement extends LookupElement {
 
-		protected boolean shareable = true;
+		protected final boolean shareable;
 
 		public ResourceElement(Member member, PropertyDescriptor pd) {
 			super(member, pd);
-		}
-
-		@Override
-		protected void initAnnotation(AnnotatedElement ae) {
+			AnnotatedElement ae = (AnnotatedElement) member;
 			Resource resource = ae.getAnnotation(Resource.class);
 			String resourceName = resource.name();
 			Class<?> resourceType = resource.type();
@@ -558,16 +552,13 @@ protected Object getResourceToInject(Object target, String requestingBeanName) {
 	 */
 	private class WebServiceRefElement extends LookupElement {
 
-		private Class<?> elementType;
+		private final Class<?> elementType;
 
-		private String wsdlLocation;
+		private final String wsdlLocation;
 
 		public WebServiceRefElement(Member member, PropertyDescriptor pd) {
 			super(member, pd);
-		}
-
-		@Override
-		protected void initAnnotation(AnnotatedElement ae) {
+			AnnotatedElement ae = (AnnotatedElement) member;
 			WebServiceRef resource = ae.getAnnotation(WebServiceRef.class);
 			String resourceName = resource.name();
 			Class<?> resourceType = resource.type();
@@ -647,14 +638,11 @@ protected Object getResourceToInject(Object target, String requestingBeanName) {
 	 */
 	private class EjbRefElement extends LookupElement {
 
-		private String beanName;
+		private final String beanName;
 
 		public EjbRefElement(Member member, PropertyDescriptor pd) {
 			super(member, pd);
-		}
-
-		@Override
-		protected void initAnnotation(AnnotatedElement ae) {
+			AnnotatedElement ae = (AnnotatedElement) member;
 			EJB resource = ae.getAnnotation(EJB.class);
 			String resourceBeanName = resource.beanName();
 			String resourceName = resource.name();
