From 99e8f66b282f023eda7848e3752bb5364040b0e0 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 30 Mar 2010 15:44:11 +0000 Subject: [PATCH] adapted to common naming convention for internal attributes git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3193 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../aop/interceptor/ExposeBeanNameAdvisors.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java index 96f4f506710..81b31107424 100644 --- a/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java +++ b/org.springframework.aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ public abstract class ExposeBeanNameAdvisors { * Binding for the bean name of the bean which is currently being invoked * in the ReflectiveMethodInvocation userAttributes Map. */ - private static final String BEAN_NAME_ATTRIBUTE = ExposeBeanNameAdvisors.class.getName() + ".beanName"; + private static final String BEAN_NAME_ATTRIBUTE = ExposeBeanNameAdvisors.class.getName() + ".BEAN_NAME"; /** @@ -114,7 +114,7 @@ public abstract class ExposeBeanNameAdvisors { throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi); } ProxyMethodInvocation pmi = (ProxyMethodInvocation) mi; - pmi.setUserAttribute(BEAN_NAME_ATTRIBUTE, beanName); + pmi.setUserAttribute(BEAN_NAME_ATTRIBUTE, this.beanName); return mi.proceed(); } } @@ -137,7 +137,7 @@ public abstract class ExposeBeanNameAdvisors { throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi); } ProxyMethodInvocation pmi = (ProxyMethodInvocation) mi; - pmi.setUserAttribute(BEAN_NAME_ATTRIBUTE, beanName); + pmi.setUserAttribute(BEAN_NAME_ATTRIBUTE, this.beanName); return super.invoke(mi); }