Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Brian Clozel
2024-04-09 18:36:53 +02:00
parent a9fffa844f ac74116d76
commit c3aa0cd815
2 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -971,6 +971,9 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
try {
con = createConnection();
session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
if (micrometerJakartaPresent && this.observationRegistry != null) {
session = MicrometerInstrumentation.instrumentSession(session, this.observationRegistry);
}
if (startConnection) {
con.start();
}