Author: ard Date: Wed Jun 27 14:54:10 2012 New Revision: 1354557 URL: http://svn.apache.org/viewvc?rev=1354557&view=rev Log: OCM-34 applied patch Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java Modified: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java?rev=1354557&r1=1354556&r2=1354557&view=diff ============================================================================== --- jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java (original) +++ jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/manager/impl/ObjectContentManagerImpl.java Wed Jun 27 14:54:10 2012 @@ -363,11 +363,13 @@ public class ObjectContentManagerImpl im public void retrieveAllMappedAttributes(Object object) { objectConverter.retrieveAllMappedAttributes(session, object); + requestObjectCache.clear(); } public void retrieveMappedAttribute(Object object, String attributeName) { objectConverter.retrieveMappedAttribute(session, object, attributeName); + requestObjectCache.clear(); } @@ -981,6 +983,8 @@ public class ObjectContentManagerImpl im throw new ObjectContentManagerException("Cannot persist current session changes. Violation of a lock detected", le); } catch (RepositoryException e) { throw new ObjectContentManagerException("Cannot persist current session changes.", e); + } finally { + requestObjectCache.clear(); } }