X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Ffs%2FCmsFsBrowser.java;h=4e0067521d4c70d7ff057b1b6f52707c004f2f79;hb=11c9710b1d2456c8304a5841d775af008a794431;hp=8562138a96a6341785f4e70a7a1c7b0073f9a699;hpb=2d6bb34c3fa3f9fd4201bfb422e412a555b3dceb;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java
index 8562138a9..4e0067521 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/fs/CmsFsBrowser.java
@@ -18,9 +18,10 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 
+import org.argeo.api.NodeUtils;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.fs.FileIconNameLabelProvider;
@@ -28,7 +29,7 @@ import org.argeo.eclipse.ui.fs.FsTableViewer;
 import org.argeo.eclipse.ui.fs.FsUiConstants;
 import org.argeo.eclipse.ui.fs.FsUiUtils;
 import org.argeo.eclipse.ui.fs.NioFileLabelProvider;
-import org.argeo.node.NodeUtils;
+import org.argeo.jcr.JcrUtils;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -93,13 +94,16 @@ public class CmsFsBrowser extends Composite {
 	private final static String NODE_PREFIX = "node://";
 
 	private String getCurrentHomePath() {
+		Session session = null;
 		try {
 			Repository repo = currentBaseContext.getSession().getRepository();
-			Session session = CurrentUser.tryAs(() -> repo.login());
+			session = CurrentUser.tryAs(() -> repo.login());
 			String homepath = NodeUtils.getUserHome(session).getPath();
 			return homepath;
 		} catch (Exception e) {
 			throw new CmsException("Cannot retrieve Current User Home Path", e);
+		} finally {
+			JcrUtils.logoutQuietly(session);
 		}
 	}
 
@@ -273,7 +277,7 @@ public class CmsFsBrowser extends Composite {
 		else
 			nameStr = path.getFileName().toString();
 		elemBtn.setText(nameStr + " >> ");
-		CmsUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN);
+		CmsUiUtils.style(elemBtn, FsStyles.BREAD_CRUMB_BTN);
 		elemBtn.addSelectionListener(new SelectionAdapter() {
 			private static final long serialVersionUID = -4103695476023480651L;
 
@@ -319,7 +323,7 @@ public class CmsFsBrowser extends Composite {
 	}
 
 	private void populateBookmarks(Composite parent) {
-		CmsUtils.clear(parent);
+		CmsUiUtils.clear(parent);
 		parent.setLayout(new GridLayout());
 		ISelectionChangedListener selList = new BookmarksSelChangeListener();