Improve clean up of thredaed JCR sessions

git-svn-id: https://svn.argeo.org/commons/trunk@7855 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java b/org.argeo.server.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
index 193f22c48c99780e72af4c70a7956cab8ed07370..722215701b00f4544f58df0e264e568986349251 100644 (file)
--- a/org.argeo.server.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
+++ b/org.argeo.server.jcr/src/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
@@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 
 /** Proxy JCR sessions and attach them to calling threads. */
+@Deprecated
 public abstract class ThreadBoundJcrSessionFactory {
        private final static Log log = LogFactory
                        .getLog(ThreadBoundJcrSessionFactory.class);
@@ -129,9 +130,9 @@ public abstract class ThreadBoundJcrSessionFactory {
                monitoringThread.start();
        }
 
-       public synchronized void dispose() throws Exception {
-               if (activeSessions.size() == 0)
-                       return;
+       public void dispose() throws Exception {
+               // if (activeSessions.size() == 0)
+               // return;
 
                if (log.isTraceEnabled())
                        log.trace("Cleaning up " + activeSessions.size()

diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/spring/BeanNodeMapper.java b/org.argeo.server.jcr/src/org/argeo/jcr/spring/BeanNodeMapper.java
index 9f70f5c58d2637381854a8ed213e6cff95df63c3..e78cee452a26e0acc69b8529bec6c6edc0b9b586 100644 (file)
--- a/org.argeo.server.jcr/src/org/argeo/jcr/spring/BeanNodeMapper.java
+++ b/org.argeo.server.jcr/src/org/argeo/jcr/spring/BeanNodeMapper.java
@@ -47,6 +47,7 @@ import org.argeo.jcr.NodeMapperProvider;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 
+@Deprecated
 public class BeanNodeMapper implements NodeMapper {
        private final static Log log = LogFactory.getLog(BeanNodeMapper.class);
 

diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/spring/ThreadBoundSession.java b/org.argeo.server.jcr/src/org/argeo/jcr/spring/ThreadBoundSession.java
index a46bef1fe47af84fcda6dc14df035f6fddbc4d58..35f0215554ba5f4f6dfbf5dee4f90b5b989b3f9d 100644 (file)
--- a/org.argeo.server.jcr/src/org/argeo/jcr/spring/ThreadBoundSession.java
+++ b/org.argeo.server.jcr/src/org/argeo/jcr/spring/ThreadBoundSession.java
@@ -20,6 +20,8 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
+@SuppressWarnings("rawtypes")
+@Deprecated
 public class ThreadBoundSession extends ThreadBoundJcrSessionFactory implements FactoryBean, InitializingBean, DisposableBean{
        public void afterPropertiesSet() throws Exception {
                init();