Browse Source

Polishing

pull/940/head
Juergen Hoeller 9 years ago
parent
commit
9e03e0e73d
  1. 2
      spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
  2. 10
      spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
  3. 11
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java

@ -49,7 +49,7 @@ import org.hibernate.persister.entity.EntityPersister; @@ -49,7 +49,7 @@ import org.hibernate.persister.entity.EntityPersister;
* @since 1.2
* @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setEventListeners(java.util.Map)
*/
@SuppressWarnings({ "serial", "rawtypes", "deprecation" })
@SuppressWarnings({"serial", "rawtypes", "deprecation"})
public class IdTransferringMergeEventListener extends DefaultMergeEventListener {
/**

10
spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java

@ -75,9 +75,11 @@ import org.springframework.web.servlet.View; @@ -75,9 +75,11 @@ import org.springframework.web.servlet.View;
*/
public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExceptionResolver {
// dummy method placeholder
private static final Method NO_METHOD_FOUND =
ClassUtils.getMethodIfAvailable(System.class, "currentTimeMillis", (Class<?>[]) null);
/**
* Arbitrary {@link Method} reference, indicating no method found in the cache.
*/
private static final Method NO_METHOD_FOUND = ClassUtils.getMethodIfAvailable(System.class, "currentTimeMillis");
private final Map<Class<?>, Map<Class<? extends Throwable>, Method>> exceptionHandlerCache =
new ConcurrentHashMap<Class<?>, Map<Class<? extends Throwable>, Method>>(64);
@ -210,7 +212,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc @@ -210,7 +212,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc
/**
* Uses the {@link ExceptionDepthComparator} to find the best matching method.
* @return the best matching method or {@code null}.
* @return the best matching method, or {@code null} if none found
*/
private Method getBestMatchingMethod(
Map<Class<? extends Throwable>, Method> resolverMethods, Exception thrownException) {

11
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java

@ -88,8 +88,11 @@ import org.springframework.web.servlet.support.RequestContextUtils; @@ -88,8 +88,11 @@ import org.springframework.web.servlet.support.RequestContextUtils;
@Deprecated
public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExceptionResolver {
// dummy method placeholder
private static final Method NO_METHOD_FOUND = ClassUtils.getMethodIfAvailable(System.class, "currentTimeMillis", (Class<?>[]) null);
/**
* Arbitrary {@link Method} reference, indicating no method found in the cache.
*/
private static final Method NO_METHOD_FOUND = ClassUtils.getMethodIfAvailable(System.class, "currentTimeMillis");
private final Map<Class<?>, Map<Class<? extends Throwable>, Method>> exceptionHandlerCache =
new ConcurrentHashMap<Class<?>, Map<Class<? extends Throwable>, Method>>(64);
@ -234,8 +237,8 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc @@ -234,8 +237,8 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc
}
/**
* Uses the {@link DepthComparator} to find the best matching method
* @return the best matching method or {@code null}.
* Uses the {@link ExceptionDepthComparator} to find the best matching method.
* @return the best matching method, or {@code null} if none found
*/
private Method getBestMatchingMethod(
Map<Class<? extends Throwable>, Method> resolverMethods, Exception thrownException) {

Loading…
Cancel
Save