From e8b37eb8801be89ddbe8ca85f16dcf463d45e3db Mon Sep 17 00:00:00 2001 From: Britt Park Date: Tue, 5 Dec 2006 03:37:39 +0000 Subject: [PATCH] Attempt to at working around CGLIB bug. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/avm/AVMRepository.java | 9 ++++++++- source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/avm/AVMRepository.java b/source/java/org/alfresco/repo/avm/AVMRepository.java index e096ea840a..77184f2587 100644 --- a/source/java/org/alfresco/repo/avm/AVMRepository.java +++ b/source/java/org/alfresco/repo/avm/AVMRepository.java @@ -47,6 +47,7 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.namespace.QName; import org.alfresco.util.Pair; import org.apache.log4j.Logger; +import org.hibernate.proxy.HibernateProxy; /** * This or AVMStore are @@ -1106,7 +1107,13 @@ public class AVMRepository */ private AVMStore getAVMStoreByName(String name) { - return AVMDAOs.Instance().fAVMStoreDAO.getByName(name); + AVMStore store = AVMDAOs.Instance().fAVMStoreDAO.getByName(name); + if (store instanceof HibernateProxy) + { + store = + (AVMStore)((HibernateProxy)store).getHibernateLazyInitializer().getImplementation(); + } + return store; } /** diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml index 47c9b46106..bd2be7ef8b 100644 --- a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml +++ b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml @@ -102,7 +102,7 @@ + proxy="AVMStore" optimistic-lock="version">