X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=library%2FRemoteLibrary.java;h=a4f00ceff53546eaf1849e526c656add37fa6d17;hb=9a553563269f93bae59cf45e43933c81fdec07e8;hp=ce4305aadad96bfe9446817d467234545ccfce7a;hpb=0fc81e6465aa9c1f1dfc19b532082220d609768a;p=nikiroo-utils.git

diff --git a/library/RemoteLibrary.java b/library/RemoteLibrary.java
index ce4305a..a4f00ce 100644
--- a/library/RemoteLibrary.java
+++ b/library/RemoteLibrary.java
@@ -124,9 +124,9 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	public Status getStatus() {
-		Instance.getTraceHandler().trace("Getting remote lib status...");
+		Instance.getInstance().getTraceHandler().trace("Getting remote lib status...");
 		Status status = getStatusDo();
-		Instance.getTraceHandler().trace("Remote lib status: " + status);
+		Instance.getInstance().getTraceHandler().trace("Remote lib status: " + status);
 		return status;
 	}
 
@@ -426,7 +426,7 @@ public class RemoteLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public synchronized File getFile(final String luid, Progress pg) {
+	public File getFile(final String luid, Progress pg) {
 		throw new java.lang.InternalError(
 				"Operation not supportorted on remote Libraries");
 	}
@@ -435,20 +435,23 @@ public class RemoteLibrary extends BasicLibrary {
 	 * Stop the server.
 	 * 
 	 * @throws IOException
-	 *             in case of I/O error (including bad key)
+	 *             in case of I/O errors
+	 * @throws SSLException
+	 *             when the key was not accepted
 	 */
-	public void exit() throws IOException {
+	public void exit() throws IOException, SSLException {
 		connectRemoteAction(new RemoteAction() {
 			@Override
 			public void action(ConnectActionClientObject action)
 					throws Exception {
 				action.send(new Object[] { subkey, "EXIT" });
+				Thread.sleep(100);
 			}
 		});
 	}
 
 	@Override
-	public synchronized MetaData getInfo(String luid) throws IOException {
+	public MetaData getInfo(String luid) throws IOException {
 		List<MetaData> metas = getMetasList(luid, null);
 		if (!metas.isEmpty()) {
 			return metas.get(0);
@@ -559,7 +562,7 @@ public class RemoteLibrary extends BasicLibrary {
 				@Override
 				protected void onError(Exception e) {
 					if (!(e instanceof IOException)) {
-						Instance.getTraceHandler().error(e);
+						Instance.getInstance().getTraceHandler().error(e);
 						return;
 					}