X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibraryServer.java;h=1f655457c96a6eb405caef125e5accd1b021f391;hb=c08c6ca10b3da06d7efbcaed7df4afa8af3b62fc;hp=0319439c05f012b630bbd422f900232f25a3caa7;hpb=95e522ea1a6d23e089e207ea67c1fc0296bf7389;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 0319439..1f65545 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -2,7 +2,6 @@ package be.nikiroo.fanfix.library;
 
 import java.io.IOException;
 import java.net.URL;
-import java.rmi.AccessException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -149,7 +148,7 @@ public class RemoteLibraryServer extends ServerObject {
 		try {
 			rep = doRequest(action, command, args, rw, whitelist);
 		} catch (IOException e) {
-			rep = new RemoteLibraryException(e);
+			rep = new RemoteLibraryException(e, true);
 		}
 
 		commands.put(id, command);
@@ -266,8 +265,8 @@ public class RemoteLibraryServer extends ServerObject {
 			}
 		} else if ("SAVE_STORY".equals(command)) {
 			if (!rw) {
-				throw new AccessException("Read-Only remote library: " 
-						+ args[0]);
+				throw new RemoteLibraryException("Read-Only remote library: "
+						+ args[0], false);
 			}
 
 			List<Object> list = new ArrayList<Object>();
@@ -285,19 +284,19 @@ public class RemoteLibraryServer extends ServerObject {
 			return story.getMeta().getLuid();
 		} else if ("IMPORT".equals(command)) {
 			if (!rw) {
-				throw new AccessException("Read-Only remote library: " 
-						+ args[0]);
+				throw new RemoteLibraryException("Read-Only remote library: "
+						+ args[0], false);
 			}
 
 			Progress pg = createPgForwarder(action);
-			Story story = Instance.getLibrary().imprt(
+			MetaData meta = Instance.getLibrary().imprt(
 					new URL((String) args[0]), pg);
 			forcePgDoneSent(pg);
-			return story.getMeta().getLuid();
+			return meta.getLuid();
 		} else if ("DELETE_STORY".equals(command)) {
 			if (!rw) {
-				throw new AccessException("Read-Only remote library: " 
-						+ args[0]);
+				throw new RemoteLibraryException("Read-Only remote library: "
+						+ args[0], false);
 			}
 
 			Instance.getLibrary().delete((String) args[0]);
@@ -315,8 +314,8 @@ public class RemoteLibraryServer extends ServerObject {
 			}
 		} else if ("SET_COVER".equals(command)) {
 			if (!rw) {
-				throw new AccessException("Read-Only remote library: " 
-						+ args[0] + ", " + args[1]);
+				throw new RemoteLibraryException("Read-Only remote library: "
+						+ args[0] + ", " + args[1], false);
 			}
 
 			if ("SOURCE".equals(args[0])) {
@@ -328,8 +327,8 @@ public class RemoteLibraryServer extends ServerObject {
 			}
 		} else if ("CHANGE_STA".equals(command)) {
 			if (!rw) {
-				throw new AccessException("Read-Only remote library: " 
-						+ args[0] + ", " + args[1]);
+				throw new RemoteLibraryException("Read-Only remote library: "
+						+ args[0] + ", " + args[1], false);
 			}
 
 			Progress pg = createPgForwarder(action);
@@ -338,11 +337,11 @@ public class RemoteLibraryServer extends ServerObject {
 			forcePgDoneSent(pg);
 		} else if ("EXIT".equals(command)) {
 			if (!rw) {
-				throw new AccessException(
-						"Read-Only remote library: EXIT");
+				throw new RemoteLibraryException(
+						"Read-Only remote library: EXIT", false);
 			}
 
-			stop(0, false);
+			stop(10000, false);
 		}
 
 		return null;