diff --git a/spring-core/src/main/java/org/springframework/objenesis/SpringObjenesis.java b/spring-core/src/main/java/org/springframework/objenesis/SpringObjenesis.java index 031ef027f03..84f5bf9cc66 100644 --- a/spring-core/src/main/java/org/springframework/objenesis/SpringObjenesis.java +++ b/spring-core/src/main/java/org/springframework/objenesis/SpringObjenesis.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2025 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. @@ -69,7 +69,7 @@ public class SpringObjenesis implements Objenesis { this.strategy = (strategy != null ? strategy : new StdInstantiatorStrategy()); // Evaluate the "spring.objenesis.ignore" property upfront... - if (SpringProperties.getFlag(SpringObjenesis.IGNORE_OBJENESIS_PROPERTY_NAME)) { + if (SpringProperties.getFlag(IGNORE_OBJENESIS_PROPERTY_NAME)) { this.worthTrying = Boolean.FALSE; } } diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java index 32816c00927..b40101595a1 100644 --- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2025 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. @@ -209,6 +209,7 @@ public abstract class AbstractJmsListenerContainerFactoryOr wrap your entire processing with an XA transaction, covering the - * reception of the JMS message as well as the execution of the business logic in + * receipt of the JMS message as well as the execution of the business logic in * your message listener (including database operations etc). This is only * supported by {@link DefaultMessageListenerContainer}, through specifying * an external "transactionManager" (typically a @@ -152,7 +152,8 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen implements MessageListenerContainer { private static final boolean micrometerJakartaPresent = ClassUtils.isPresent( - "io.micrometer.jakarta9.instrument.jms.JmsInstrumentation", AbstractMessageListenerContainer.class.getClassLoader()); + "io.micrometer.jakarta9.instrument.jms.JmsInstrumentation", + AbstractMessageListenerContainer.class.getClassLoader()); @Nullable private volatile Object destination; @@ -170,14 +171,14 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen @Nullable private String subscriptionName; + private boolean pubSubNoLocal = false; + @Nullable private Boolean replyPubSubDomain; @Nullable private QosSettings replyQosSettings; - private boolean pubSubNoLocal = false; - @Nullable private MessageConverter messageConverter; @@ -500,12 +501,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen */ @Override public boolean isReplyPubSubDomain() { - if (this.replyPubSubDomain != null) { - return this.replyPubSubDomain; - } - else { - return isPubSubDomain(); - } + return (this.replyPubSubDomain != null ? this.replyPubSubDomain : isPubSubDomain()); } /**