root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

use internal Set for TransactionSynchronization objects in order to allow for equals/hashCode based replacement

This commit is contained in:
Juergen Hoeller 2011-10-11 01:11:17 +00:00
parent 4c49cc73b2
commit 1f89243361
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -19,9 +19,10 @@ package org.springframework.transaction.support;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -79,8 +80,8 @@ public abstract class TransactionSynchronizationManager {
private static final ThreadLocal<Map<Object, Object>> resources = private static final ThreadLocal<Map<Object, Object>> resources =
new NamedThreadLocal<Map<Object, Object>>("Transactional resources"); new NamedThreadLocal<Map<Object, Object>>("Transactional resources");
private static final ThreadLocal<List<TransactionSynchronization>> synchronizations = private static final ThreadLocal<Set<TransactionSynchronization>> synchronizations =
new NamedThreadLocal<List<TransactionSynchronization>>("Transaction synchronizations"); new NamedThreadLocal<Set<TransactionSynchronization>>("Transaction synchronizations");
private static final ThreadLocal<String> currentTransactionName = private static final ThreadLocal<String> currentTransactionName =
new NamedThreadLocal<String>("Current transaction name"); new NamedThreadLocal<String>("Current transaction name");
@ -256,7 +257,7 @@ public abstract class TransactionSynchronizationManager {
throw new IllegalStateException("Cannot activate transaction synchronization - already active"); throw new IllegalStateException("Cannot activate transaction synchronization - already active");
} }
logger.trace("Initializing transaction synchronization"); logger.trace("Initializing transaction synchronization");
synchronizations.set(new LinkedList<TransactionSynchronization>()); synchronizations.set(new LinkedHashSet<TransactionSynchronization>());
} }
/** /**
@ -287,7 +288,7 @@ public abstract class TransactionSynchronizationManager {
* @see TransactionSynchronization * @see TransactionSynchronization
*/ */
public static List<TransactionSynchronization> getSynchronizations() throws IllegalStateException { public static List<TransactionSynchronization> getSynchronizations() throws IllegalStateException {
List<TransactionSynchronization> synchs = synchronizations.get(); Set<TransactionSynchronization> synchs = synchronizations.get();
if (synchs == null) { if (synchs == null) {
throw new IllegalStateException("Transaction synchronization is not active"); throw new IllegalStateException("Transaction synchronization is not active");
} }
@ -299,8 +300,9 @@ public abstract class TransactionSynchronizationManager {
} }
else { else {
// Sort lazily here, not in registerSynchronization. // Sort lazily here, not in registerSynchronization.
OrderComparator.sort(synchs); List<TransactionSynchronization> sortedSynchs = new ArrayList<TransactionSynchronization>(synchs);
return Collections.unmodifiableList(new ArrayList<TransactionSynchronization>(synchs)); OrderComparator.sort(sortedSynchs);
return Collections.unmodifiableList(sortedSynchs);
} }
} }