From 26470cc23a91108276ba5c37bddd0b71cda6ed50 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 22 Mar 2010 18:31:41 +0000 Subject: [PATCH] polishing --- ...nstantiationModelAwarePointcutAdvisorImpl.java | 15 +++++---------- .../aop/framework/JdkDynamicAopProxy.java | 8 ++++---- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java index 5bce339063..433a33bb6b 100644 --- a/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java +++ b/org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 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. @@ -58,18 +58,13 @@ class InstantiationModelAwarePointcutAdvisorImpl private String aspectName; - private Boolean isBeforeAdvice = null; + private Boolean isBeforeAdvice; - private Boolean isAfterAdvice = null; + private Boolean isAfterAdvice; - public InstantiationModelAwarePointcutAdvisorImpl( - AspectJAdvisorFactory af, - AspectJExpressionPointcut ajexp, - MetadataAwareAspectInstanceFactory aif, - Method method, - int declarationOrderInAspect, - String aspectName) { + public InstantiationModelAwarePointcutAdvisorImpl(AspectJAdvisorFactory af, AspectJExpressionPointcut ajexp, + MetadataAwareAspectInstanceFactory aif, Method method, int declarationOrderInAspect, String aspectName) { this.declaredPointcut = ajexp; this.method = method; diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java b/org.springframework.aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java index 1c9daa47c5..5b2e4992b5 100644 --- a/org.springframework.aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java +++ b/org.springframework.aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 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. @@ -146,7 +146,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa * unless a hook method throws an exception. */ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - MethodInvocation invocation = null; + MethodInvocation invocation; Object oldProxy = null; boolean setProxyContext = false; @@ -169,7 +169,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa return AopUtils.invokeJoinpointUsingReflection(this.advised, method, args); } - Object retVal = null; + Object retVal; if (this.advised.exposeProxy) { // Make invocation available if necessary. @@ -239,7 +239,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa return false; } - JdkDynamicAopProxy otherProxy = null; + JdkDynamicAopProxy otherProxy; if (other instanceof JdkDynamicAopProxy) { otherProxy = (JdkDynamicAopProxy) other; }