git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remote lib exceptions 1
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
RemoteLibraryServer.java
diff --git
a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 1f288ab7ab3b920ca8ee6830f523295d40f0f4c1..ada467311d1e2d77801b6a7df379ee0272dad3f4 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@
-144,13
+144,23
@@
public class RemoteLibraryServer extends ServerObject {
}
System.out.println(trace);
}
System.out.println(trace);
- Object rep = doRequest(action, command, args, rw, whitelist);
+ Object rep = null;
+ Exception oops = null;
+ try {
+ rep = doRequest(action, command, args, rw, whitelist);
+ } catch (Exception e) {
+ oops = e;
+ }
commands.put(id, command);
wls.put(id, wl);
rws.put(id, rw);
times.put(id, (new Date().getTime() - start));
commands.put(id, command);
wls.put(id, wl);
rws.put(id, rw);
times.put(id, (new Date().getTime() - start));
+ if (oops != null) {
+ throw oops;
+ }
+
return rep;
}
return rep;
}
@@
-209,7
+219,16
@@
public class RemoteLibraryServer extends ServerObject {
forcePgDoneSent(pg);
} else {
forcePgDoneSent(pg);
} else {
- metas.add(Instance.getLibrary().getInfo((String) args[0]));
+ MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
+ MetaData light;
+ if (meta.getCover() == null) {
+ light = meta;
+ } else {
+ light = meta.clone();
+ light.setCover(null);
+ }
+
+ metas.add(light);
}
if (!whitelist.isEmpty()) {
}
if (!whitelist.isEmpty()) {