X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FThreadBoundJcrSessionFactory.java;h=4e9e0a759d51f7e1b44110f3cc6e2acbdbe7a9a0;hb=4a466f59df24fa18799297486b8d084b2a1aecba;hp=1c33a43dec9a6788831fa92a2e8b83326645438c;hpb=8b78007039ccb1f19d498742a64cf62435e8b093;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
index 1c33a43de..4e9e0a759 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
@@ -35,13 +35,9 @@ import javax.jcr.SimpleCredentials;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
 
 /** Proxy JCR sessions and attach them to calling threads. */
-public class ThreadBoundJcrSessionFactory implements FactoryBean,
-		InitializingBean, DisposableBean {
+public abstract class ThreadBoundJcrSessionFactory {
 	private final static Log log = LogFactory
 			.getLog(ThreadBoundJcrSessionFactory.class);
 
@@ -73,7 +69,7 @@ public class ThreadBoundJcrSessionFactory implements FactoryBean,
 	}
 
 	/** Logs in to the repository using various strategies. */
-	protected Session login() {
+	protected synchronized Session login() {
 		if (!isActive())
 			throw new ArgeoException("Thread bound session factory inactive");
 
@@ -126,12 +122,12 @@ public class ThreadBoundJcrSessionFactory implements FactoryBean,
 		return proxiedSession;
 	}
 
-	public void afterPropertiesSet() throws Exception {
+	public void init() throws Exception {
 		monitoringThread = new MonitoringThread();
 		monitoringThread.start();
 	}
 
-	public synchronized void destroy() throws Exception {
+	public synchronized void dispose() throws Exception {
 		if (activeSessions.size() == 0)
 			return;
 
@@ -256,6 +252,10 @@ public class ThreadBoundJcrSessionFactory implements FactoryBean,
 	/** Monitors registered thread in order to clean up dead ones. */
 	private class MonitoringThread extends Thread {
 
+		public MonitoringThread() {
+			super("ThreadBound JCR Session Monitor");
+		}
+
 		@Override
 		public void run() {
 			while (isActive()) {