Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MethodReference accesses cached executor in a thread-safe manner

Browse Source 
Issue: SPR-12269
This commit is contained in:
Juergen Hoeller
2014-09-29 17:31:13 +02:00
parent bb45fb4538
commit c508a70c15
2 changed files with 115 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
View File

@@ -83,11 +83,7 @@ public class MethodReference extends SpelNodeImpl {
TypeDescriptor targetType = state.getActiveContextObject().getTypeDescriptor();
Object[] arguments = getArguments(state);
TypedValue result = getValueInternal(evaluationContext, value, targetType, arguments);
if (cachedExecutor.get() instanceof ReflectiveMethodExecutor) {
ReflectiveMethodExecutor executor = (ReflectiveMethodExecutor) cachedExecutor.get();
Method method = executor.getMethod();
exitTypeDescriptor = CodeFlow.toDescriptor(method.getReturnType());
}
updateExitTypeDescriptor();
return result;
}
@@ -172,7 +168,9 @@ public class MethodReference extends SpelNodeImpl {
return Collections.unmodifiableList(descriptors);
}
private MethodExecutor getCachedExecutor(EvaluationContext evaluationContext, Object value, TypeDescriptor target, List<TypeDescriptor> argumentTypes) {
private MethodExecutor getCachedExecutor(EvaluationContext evaluationContext, Object value,
TypeDescriptor target, List<TypeDescriptor> argumentTypes) {
List<MethodResolver> methodResolvers = evaluationContext.getMethodResolvers();
if (methodResolvers == null || methodResolvers.size() != 1 ||
!(methodResolvers.get(0) instanceof ReflectiveMethodResolver)) {
@@ -230,6 +228,14 @@ public class MethodReference extends SpelNodeImpl {
}
}
private void updateExitTypeDescriptor() {
CachedMethodExecutor executorToCheck = this.cachedExecutor;
if (executorToCheck.get() instanceof ReflectiveMethodExecutor) {
Method method = ((ReflectiveMethodExecutor) executorToCheck.get()).getMethod();
this.exitTypeDescriptor = CodeFlow.toDescriptor(method.getReturnType());
}
}
@Override
public String toStringAST() {
StringBuilder sb = new StringBuilder();
@@ -244,6 +250,80 @@ public class MethodReference extends SpelNodeImpl {
return sb.toString();
}
/**
* A method reference is compilable if it has been resolved to a reflectively accessible method
* and the child nodes (arguments to the method) are also compilable.
*/
@Override
public boolean isCompilable() {
CachedMethodExecutor executorToCheck = this.cachedExecutor;
if (executorToCheck == null || !(executorToCheck.get() instanceof ReflectiveMethodExecutor)) {
return false;
}
for (SpelNodeImpl child : this.children) {
if (!child.isCompilable()) {
return false;
}
}
ReflectiveMethodExecutor executor = (ReflectiveMethodExecutor) executorToCheck.get();
Method method = executor.getMethod();
if (!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) {
return false;
}
if (method.isVarArgs()) {
return false;
}
if (executor.didArgumentConversionOccur()) {
return false;
}
return true;
}
@Override
public void generateCode(MethodVisitor mv, CodeFlow codeflow) {
CachedMethodExecutor executorToCheck = this.cachedExecutor;
if (executorToCheck == null || !(executorToCheck.get() instanceof ReflectiveMethodExecutor)) {
throw new IllegalStateException("No applicable cached executor found: " + executorToCheck);
}
Method method = ((ReflectiveMethodExecutor) executorToCheck.get()).getMethod();
boolean isStaticMethod = Modifier.isStatic(method.getModifiers());
String descriptor = codeflow.lastDescriptor();
if (descriptor == null && !isStaticMethod) {
codeflow.loadTarget(mv);
}
boolean itf = method.getDeclaringClass().isInterface();
String methodDeclaringClassSlashedDescriptor = method.getDeclaringClass().getName().replace('.', '/');
if (!isStaticMethod) {
if (descriptor == null || !descriptor.equals(methodDeclaringClassSlashedDescriptor)) {
mv.visitTypeInsn(CHECKCAST, methodDeclaringClassSlashedDescriptor);
}
}
String[] paramDescriptors = CodeFlow.toParamDescriptors(method);
for (int i = 0; i < this.children.length;i++) {
SpelNodeImpl child = this.children[i];
codeflow.enterCompilationScope();
child.generateCode(mv, codeflow);
// Check if need to box it for the method reference?
if (CodeFlow.isPrimitive(codeflow.lastDescriptor()) && paramDescriptors[i].charAt(0) == 'L') {
CodeFlow.insertBoxIfNecessary(mv, codeflow.lastDescriptor().charAt(0));
}
else if (!codeflow.lastDescriptor().equals(paramDescriptors[i])) {
// This would be unnecessary in the case of subtyping (e.g. method takes Number but Integer passed in)
CodeFlow.insertCheckCast(mv, paramDescriptors[i]);
}
codeflow.exitCompilationScope();
}
mv.visitMethodInsn(isStaticMethod ? INVOKESTATIC : INVOKEVIRTUAL,
methodDeclaringClassSlashedDescriptor, method.getName(), CodeFlow.createSignatureDescriptor(method), itf);
codeflow.pushDescriptor(this.exitTypeDescriptor);
}
private class MethodValueRef implements ValueRef {
@@ -264,12 +344,9 @@ public class MethodReference extends SpelNodeImpl {
@Override
public TypedValue getValue() {
TypedValue result = MethodReference.this.getValueInternal(this.evaluationContext, this.value, this.targetType, this.arguments);
if (MethodReference.this.cachedExecutor.get() instanceof ReflectiveMethodExecutor) {
ReflectiveMethodExecutor executor = (ReflectiveMethodExecutor) MethodReference.this.cachedExecutor.get();
Method method = executor.getMethod();
MethodReference.this.exitTypeDescriptor = CodeFlow.toDescriptor(method.getReturnType());
}
TypedValue result = MethodReference.this.getValueInternal(
this.evaluationContext, this.value, this.targetType, this.arguments);
updateExitTypeDescriptor();
return result;
}
@@ -313,70 +390,4 @@ public class MethodReference extends SpelNodeImpl {
}
}
/**
* A method reference is compilable if it has been resolved to a reflectively accessible method
* and the child nodes (arguments to the method) are also compilable.
*/
@Override
public boolean isCompilable() {
if (this.cachedExecutor == null || !(this.cachedExecutor.get() instanceof ReflectiveMethodExecutor)) {
return false;
}
for (SpelNodeImpl child: children) {
if (!child.isCompilable()) {
return false;
}
}
ReflectiveMethodExecutor executor = (ReflectiveMethodExecutor) this.cachedExecutor.get();
Method method = executor.getMethod();
if (!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) {
return false;
}
if (method.isVarArgs()) {
return false;
}
if (executor.didArgumentConversionOccur()) {
return false;
}
return true;
}
@Override
public void generateCode(MethodVisitor mv,CodeFlow codeflow) {
ReflectiveMethodExecutor executor = (ReflectiveMethodExecutor) this.cachedExecutor.get();
Method method = executor.getMethod();
boolean isStaticMethod = Modifier.isStatic(method.getModifiers());
String descriptor = codeflow.lastDescriptor();
if (descriptor == null && !isStaticMethod) {
codeflow.loadTarget(mv);
}
boolean itf = method.getDeclaringClass().isInterface();
String methodDeclaringClassSlashedDescriptor = method.getDeclaringClass().getName().replace('.','/');
if (!isStaticMethod) {
if (descriptor == null || !descriptor.equals(methodDeclaringClassSlashedDescriptor)) {
mv.visitTypeInsn(CHECKCAST, methodDeclaringClassSlashedDescriptor);
}
}
String[] paramDescriptors = CodeFlow.toParamDescriptors(method);
for (int c = 0; c < this.children.length;c++) {
SpelNodeImpl child = this.children[c];
codeflow.enterCompilationScope();
child.generateCode(mv, codeflow);
// Check if need to box it for the method reference?
if (CodeFlow.isPrimitive(codeflow.lastDescriptor()) && (paramDescriptors[c].charAt(0)=='L')) {
CodeFlow.insertBoxIfNecessary(mv, codeflow.lastDescriptor().charAt(0));
}
else if (!codeflow.lastDescriptor().equals(paramDescriptors[c])) {
// This would be unnecessary in the case of subtyping (e.g. method takes a Number but passed in is an Integer)
CodeFlow.insertCheckCast(mv, paramDescriptors[c]);
}
codeflow.exitCompilationScope();
}
mv.visitMethodInsn(isStaticMethod ? INVOKESTATIC : INVOKEVIRTUAL,
methodDeclaringClassSlashedDescriptor, method.getName(), CodeFlow.createSignatureDescriptor(method), itf);
codeflow.pushDescriptor(this.exitTypeDescriptor);
}
}

40
spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelCompiler.java
View File

@@ -103,17 +103,18 @@ public class SpelCompiler implements Opcodes {
logger.debug("SpEL: compiling " + expression.toStringAST());
}
Class<? extends CompiledExpression> clazz = createExpressionClass(expression);
try {
return clazz.newInstance();
}
catch (Exception ex) {
throw new IllegalStateException("Failed to instantiate CompiledExpression", ex);
if (clazz != null) {
try {
return clazz.newInstance();
}
catch (Throwable ex) {
throw new IllegalStateException("Failed to instantiate CompiledExpression", ex);
}
}
}
else {
if (logger.isDebugEnabled()) {
logger.debug("SpEL: unable to compile " + expression.toStringAST());
}
if (logger.isDebugEnabled()) {
logger.debug("SpEL: unable to compile " + expression.toStringAST());
}
return null;
}
@@ -123,9 +124,11 @@ public class SpelCompiler implements Opcodes {
}
/**
* Generate the class that encapsulates the compiled expression and define it. The
* generated class will be a subtype of CompiledExpression.
* Generate the class that encapsulates the compiled expression and define it.
* The generated class will be a subtype of CompiledExpression.
* @param expressionToCompile the expression to be compiled
* @return the expression call, or {@code null} if the decision was to opt out of
* compilation during code generation
*/
@SuppressWarnings("unchecked")
private Class<? extends CompiledExpression> createExpressionClass(SpelNodeImpl expressionToCompile) {
@@ -150,10 +153,19 @@ public class SpelCompiler implements Opcodes {
CodeFlow codeflow = new CodeFlow();
// Ask the expression Ast to generate the body of the method
expressionToCompile.generateCode(mv,codeflow);
// Ask the expression AST to generate the body of the method
try {
expressionToCompile.generateCode(mv, codeflow);
}
catch (IllegalStateException ex) {
if (logger.isDebugEnabled()) {
logger.debug(expressionToCompile.getClass().getSimpleName() +
".generateCode opted out of compilation: " + ex.getMessage());
}
return null;
}
CodeFlow.insertBoxIfNecessary(mv,codeflow.lastDescriptor());
CodeFlow.insertBoxIfNecessary(mv, codeflow.lastDescriptor());
if ("V".equals(codeflow.lastDescriptor())) {
mv.visitInsn(ACONST_NULL);
}