Browse Source

Polishing

pull/1018/merge
Juergen Hoeller 10 years ago
parent
commit
c6ff0951fc
  1. 8
      spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
  2. 4
      spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java
  3. 1
      spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
  4. 7
      spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java

8
spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java vendored

@ -406,13 +406,11 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker @@ -406,13 +406,11 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
}
}
catch (VariableNotAvailableException e) {
// Ignoring failure due to missing result, consider the cache put has
// to proceed
// Ignoring failure due to missing result, consider the cache put has to proceed
}
}
// check if all puts have been excluded by condition
return cachePutContexts.size() != excluded.size();
// Check if all puts have been excluded by condition
return (cachePutContexts.size() != excluded.size());
}
private void processCacheEvicts(Collection<CacheOperationContext> contexts, boolean beforeInvocation, Object result) {

4
spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java

@ -293,8 +293,8 @@ public abstract class AbstractAdaptableMessageListener @@ -293,8 +293,8 @@ public abstract class AbstractAdaptableMessageListener
/**
* Pre-process the given result before it is converted to a {@link Message}.
* @param result the result of the invocation
* @return the payload response to handle, either the {@code result} argument or any other
* object (for instance wrapping the result).
* @return the payload response to handle, either the {@code result} argument
* or any other object (for instance wrapping the result).
* @since 4.3
*/
protected Object preProcessResponse(Object result) {

1
spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java

@ -212,6 +212,7 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B @@ -212,6 +212,7 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
*/
public Message toMessage(Object object, Session session, Class<?> jsonView)
throws JMSException, MessageConversionException {
if (jsonView != null) {
return toMessage(object, session, this.objectMapper.writerWithView(jsonView));
}

7
spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java

@ -128,15 +128,16 @@ public class MessagingMessageConverter implements MessageConverter, Initializing @@ -128,15 +128,16 @@ public class MessagingMessageConverter implements MessageConverter, Initializing
}
/**
* Create a JMS message for the specified payload and conversionHint. The conversion
* hint is an extra object passed to the {@link MessageConverter}, e.g. the associated
* {@code MethodParameter} (may be {@code null}}.
* Create a JMS message for the specified payload and conversionHint.
* The conversion hint is an extra object passed to the {@link MessageConverter},
* e.g. the associated {@code MethodParameter} (may be {@code null}}.
* @see MessageConverter#toMessage(Object, Session)
* @since 4.3
*/
@SuppressWarnings("deprecation")
protected javax.jms.Message createMessageForPayload(Object payload, Session session, Object conversionHint)
throws JMSException {
return createMessageForPayload(payload, session);
}

Loading…
Cancel
Save