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

Merge pull request #647 from olegz/INT-2777

Browse Source
This commit is contained in:
Gary Russell
2012-10-11 17:47:52 -04:00
parent cd1b36d67b 8c43c59c03
commit ef2549cf22
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java
View File

@@ -103,11 +103,10 @@ public class SourcePollingChannelAdapter extends AbstractPollingEndpoint impleme
IntegrationResourceHolder holder = null;
if (TransactionSynchronizationManager.isActualTransactionActive()) {
holder = new IntegrationResourceHolder();
holder.addAttribute(IntegrationResourceHolder.MESSAGE_SOURCE, source);
TransactionSynchronizationManager.bindResource(source, holder);
if (transactionSynchronizationFactory != null){
holder = new IntegrationResourceHolder();
holder.addAttribute(IntegrationResourceHolder.MESSAGE_SOURCE, source);
TransactionSynchronizationManager.bindResource(source, holder);
TransactionSynchronizationManager.registerSynchronization(transactionSynchronizationFactory.create(source));
}
}

8
spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
View File

@@ -211,12 +211,10 @@ public class ImapIdleChannelAdapter extends MessageProducerSupport implements Be
MessageBuilder.withPayload(mailMessage).build();
if (TransactionSynchronizationManager.isActualTransactionActive()) {
IntegrationResourceHolder holder = new IntegrationResourceHolder();
holder.setMessage(message);
TransactionSynchronizationManager.bindResource(ImapIdleChannelAdapter.this, holder);
if (transactionSynchronizationFactory != null){
IntegrationResourceHolder holder = new IntegrationResourceHolder();
holder.setMessage(message);
TransactionSynchronizationManager.bindResource(ImapIdleChannelAdapter.this, holder);
TransactionSynchronizationManager.
registerSynchronization(transactionSynchronizationFactory.create(ImapIdleChannelAdapter.this));
}

10
src/reference/docbook/transactions.xml
View File

@@ -254,10 +254,20 @@ public interface TransactionSynchronizationProcessor {
'payload'.
</para>
<important>
<para>
It is important to understand that this is simply synchronizing the actions with a transaction, it does not
make a resource that is not inherently transactional actually transactional. Instead, the transaction
(be it JDBC or otherwise) is started before the poll, and committed/rolled back when the flow completes,
followed by the synchronized action.
</para>
<para>
It is also important to understand that if you provide a custom <classname>TransactionSynchronizationFactory</classname>,
it is responsible for creating a resource synchronization that will cause the bound resource to be unbound automatically,
when the transaction completes.
The default <classname>TransactionSynchronizationFactory</classname> does this by returning a subclass
of <classname>ResourceHolderSynchronization</classname>, with the default
<emphasis>shouldUnbindAtCompletion()</emphasis> returning <code>true</code>.
</para>
</important>
<para>
In addition to the <emphasis>after-commit</emphasis> and <emphasis>after-rollback</emphasis> expressions,

8
src/reference/docbook/whats-new.xml
View File

@@ -119,14 +119,6 @@
For more information please see <xref linkend="file-writing-destination-exists"/>.
</para>
</section>
<section id="2.2-tx">
<title>Transaction Synchronization</title>
<para>
When running from a transactional poller,
mail inbound adapters can be configured to update the mailbox only
if the transaction commits.
</para>
</section>
<section id="2.2-shutdown">
<title>Orderly Shutdown</title>
<para>