master
Juergen Hoeller 15 years ago
parent 38f5c7a1d5
commit b9a3d3f392
  1. 6
      org.springframework.context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
  2. 9
      org.springframework.context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.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.
@ -33,7 +33,7 @@ import org.springframework.expression.TypedValue;
public class BeanExpressionContextAccessor implements PropertyAccessor {
public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
return (((BeanExpressionContext) target).containsObject(name));
return ((BeanExpressionContext) target).containsObject(name);
}
public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
@ -52,4 +52,4 @@ public class BeanExpressionContextAccessor implements PropertyAccessor {
return new Class[] {BeanExpressionContext.class};
}
}
}

@ -274,21 +274,20 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
private final long timeout;
LifecycleGroup(int phase, long timeout, Map<String, ? extends Lifecycle> lifecycleBeans) {
public LifecycleGroup(int phase, long timeout, Map<String, ? extends Lifecycle> lifecycleBeans) {
this.phase = phase;
this.timeout = timeout;
this.lifecycleBeans = lifecycleBeans;
}
void add(String name, Lifecycle bean) {
public void add(String name, Lifecycle bean) {
if (bean instanceof SmartLifecycle) {
this.smartMemberCount++;
}
this.members.add(new LifecycleGroupMember(name, bean));
}
void start() {
public void start() {
if (members.size() == 0) {
return;
}
@ -300,7 +299,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
}
}
void stop() {
public void stop() {
if (members.size() == 0) {
return;
}

Loading…
Cancel
Save