Added WorkspaceFolderLocked Exception

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portal/ws-synchronized-module-library@164985 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portal/wssynclibrary/shared/WorkspaceFolderLocked.java

@@ -0,0 +1,45 @@
+package org.gcube.portal.wssynclibrary.shared;
+
+
+
+/**
+ * The Class WorkspaceFolderLocked.
+ *
+ * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
+ * Mar 13, 2018
+ */
+public class WorkspaceFolderLocked extends Exception {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = -778037901117579435L;
+	private String folderId;
+
+	/**
+	 * Instantiates a new item not synched.
+	 */
+	public WorkspaceFolderLocked() {
+		super();
+	}
+
+	/**
+	 * Instantiates a new item not synched.
+	 *
+	 * @param arg0 the arg 0
+	 */
+	public WorkspaceFolderLocked(String folderId, String arg0) {
+		super(arg0);
+		this.folderId = folderId;
+	}
+
+
+	/**
+	 * @return the folderId
+	 */
+	public String getFolderId() {
+
+		return folderId;
+	}
+
+}

src/main/java/org/gcube/portal/wssynclibrary/thredds/WorkspaceThreddsSynchronize.java

@@ -13,6 +13,7 @@ import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.portal.wssynclibrary.shared.ItemNotSynched;
+import org.gcube.portal.wssynclibrary.shared.WorkspaceFolderLocked;
 import org.gcube.portal.wssynclibrary.shared.thredds.Status;
 import org.gcube.portal.wssynclibrary.shared.thredds.Sync_Status;
 import org.gcube.portal.wssynclibrary.shared.thredds.ThCatalogueBean;
@@ -89,7 +90,7 @@ public class WorkspaceThreddsSynchronize implements WorkspaceThreddsSynchronized
 	 * @see org.gcube.portal.wssynclibrary.WorkspaceSynchronizedRepository#isItemSynchronized(java.lang.String)
 	 */
 	@Override
-	public ThSyncFolderDescriptor checkItemSynched(String itemId) throws ItemNotSynched, Exception {
+	public ThSyncFolderDescriptor checkItemSynched(String itemId) throws ItemNotSynched, WorkspaceFolderLocked, Exception {
 		logger.debug("Perfoming checkItemSynched for id: "+itemId);
 		try {
 			// WHEN OPENING A FOLDER, INVOKE CHECK TO UPDATE SYNCH STATUS
@@ -108,12 +109,13 @@ public class WorkspaceThreddsSynchronize implements WorkspaceThreddsSynchronized
 			//engine.setSynchronizedFolder(config, folder.getId());
 		}catch(WorkspaceLockedException e) {
 			logger.warn("Workspace locked, going to force unlock..");
-			engine.forceUnlock(itemId);
+			throw new WorkspaceFolderLocked(itemId, "The folder id: "+itemId +" is currently locked. Another sync process is in progress");
+			//engine.forceUnlock(itemId);
 			//System.out.println("Workspace locked, going to force unlock.."); // MAINLY FOR TEST PURPOSES, OR WHEN SOMETHIGN GOES WRONG.. USE CAUTIOUSLY
 			//engine.forceUnlock(folder.getId());
 
 			//TODO???
-			return null;
+			//return null;
 			//???
 		} catch (WorkspaceInteractionException | InternalException e) {
 			logger.error("Error: ",e);