Skip to content

Commit 14fb9c4

Browse files
committed
Merge branch '2.5.x'
See gh-28377
2 parents 89b40e1 + bc2bf84 commit 14fb9c4

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsR2dbcAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2929
import org.springframework.boot.autoconfigure.condition.ConditionMessage;
3030
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
31+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3132
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
3233
import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
3334
import org.springframework.boot.devtools.autoconfigure.DevToolsR2dbcAutoConfiguration.DevToolsConnectionFactoryCondition;
@@ -49,6 +50,7 @@
4950
* @since 2.5.6
5051
*/
5152
@AutoConfigureAfter(R2dbcAutoConfiguration.class)
53+
@ConditionalOnClass(ConnectionFactory.class)
5254
@Conditional({ OnEnabledDevToolsCondition.class, DevToolsConnectionFactoryCondition.class })
5355
@Configuration(proxyBeanMethods = false)
5456
public class DevToolsR2dbcAutoConfiguration {

0 commit comments

Comments
 (0)