Author: nzamosenchuk Date: 2009-12-01 03:26:27 -0500 (Tue, 01 Dec 2009) New Revision: 910 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java Log: EXOJCR-243: small update of TransactionableDataManager as for the locks Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java 2009-12-01 08:07:29 UTC (rev 909) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java 2009-12-01 08:26:27 UTC (rev 910) @@ -24,7 +24,6 @@ import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; import org.exoplatform.services.jcr.dataflow.LockPlainChangesLogImpl; import org.exoplatform.services.jcr.dataflow.PlainChangesLog; -import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl; import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.NodeData; @@ -272,7 +271,7 @@ */ public LockData getLockData(String identifier) throws RepositoryException { - LockData lockData = null; + LockData lockData = storageDataManager.getLockData(identifier); if (txStarted()) { // This is a transaction. Check if the node was locked inside this transaction @@ -300,7 +299,7 @@ } } } - return lockData == null ? storageDataManager.getLockData(identifier) : lockData; + return lockData; } /**