From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 13 Feb 2015 23:15:08 +0000 (+0000)
Subject: Improve clean up of thredaed JCR sessions
X-Git-Tag: argeo-commons-2.1.30~370
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=fecdd5c5db23810b92a42b8ce329ab60fcea6eff;p=lgpl%2Fargeo-commons.git

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 193f22c48..722215701 100644
--- 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 9f70f5c58..e78cee452 100644
--- 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 a46bef1fe..35f021555 100644
--- 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();