Author: tolusha Date: 2010-02-18 05:17:33 -0500 (Thu, 18 Feb 2010) New Revision: 1884 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableResourceManager.java Log: EXOJCR-115: avoid using private method putIfAbsent Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableResourceManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableResourceManager.java 2010-02-18 08:38:06 UTC (rev 1883) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableResourceManager.java 2010-02-18 10:17:33 UTC (rev 1884) @@ -86,7 +86,7 @@ // make sure the list is not removed by another Session of same user, see // remove() - putIfAbsent(userSession.getUserID(), joinedList); + txResources.putIfAbsent(userSession.getUserID(), joinedList); } else { @@ -94,7 +94,7 @@ final ConcurrentLinkedQueue<SoftReference<XASessionImpl>> newJoinedList = new ConcurrentLinkedQueue<SoftReference<XASessionImpl>>(); final ConcurrentLinkedQueue<SoftReference<XASessionImpl>> previous = - putIfAbsent(userSession.getUserID(), newJoinedList); + txResources.putIfAbsent(userSession.getUserID(), newJoinedList); if (previous != null) { previous.add(new SoftReference<XASessionImpl>(userSession)); @@ -251,18 +251,4 @@ } } } - - private ConcurrentLinkedQueue<SoftReference<XASessionImpl>> putIfAbsent(String key, - ConcurrentLinkedQueue<SoftReference<XASessionImpl>> value) - { - if (!txResources.containsKey(key)) - { - return txResources.put(key, value); - } - else - { - return txResources.get(key); - } - } - }