git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
925298f
)
Fix remote calls with (valid) NULL arguments
author
Niki Roo
<niki@nikiroo.be>
Sat, 2 Dec 2017 16:25:50 +0000
(17:25 +0100)
committer
Niki Roo
<niki@nikiroo.be>
Sat, 2 Dec 2017 16:25:50 +0000
(17:25 +0100)
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
patch
|
blob
|
blame
|
history
diff --git
a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 6a62b6f09e5373e0afcd0151019cebc3dc21084c..245e6fd9b3fc7184c9178e557bb5efe4ba638b89 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@
-98,7
+98,7
@@
public class RemoteLibraryServer extends ServerObject {
if ("PING".equals(command)) {
return "PONG";
} else if ("GET_METADATA".equals(command)) {
if ("PING".equals(command)) {
return "PONG";
} else if ("GET_METADATA".equals(command)) {
- if (
args[0].equals("*"
)) {
+ if (
"*".equals(args[0]
)) {
List<MetaData> metas = Instance.getLibrary().getMetas(
createPgForwarder(action));
return metas.toArray(new MetaData[] {});
List<MetaData> metas = Instance.getLibrary().getMetas(
createPgForwarder(action));
return metas.toArray(new MetaData[] {});
@@
-106,14
+106,15
@@
public class RemoteLibraryServer extends ServerObject {
throw new InvalidParameterException(
"only * is valid here, but you passed: " + args[0]);
} else if ("GET_STORY".equals(command)) {
throw new InvalidParameterException(
"only * is valid here, but you passed: " + args[0]);
} else if ("GET_STORY".equals(command)) {
- MetaData meta = Instance.getLibrary().getInfo(
"" +
args[0]);
+ MetaData meta = Instance.getLibrary().getInfo(
(String)
args[0]);
meta = meta.clone();
meta.setCover(null);
action.send(meta);
action.rec();
meta = meta.clone();
meta.setCover(null);
action.send(meta);
action.rec();
- Story story = Instance.getLibrary().getStory("" + args[0], null);
+ Story story = Instance.getLibrary()
+ .getStory((String) args[0], null);
for (Object obj : breakStory(story)) {
action.send(obj);
action.rec();
for (Object obj : breakStory(story)) {
action.send(obj);
action.rec();
@@
-130,15
+131,16
@@
public class RemoteLibraryServer extends ServerObject {
}
Story story = rebuildStory(list);
}
Story story = rebuildStory(list);
- Instance.getLibrary().save(story,
"" +
args[0], null);
+ Instance.getLibrary().save(story,
(String)
args[0], null);
} else if ("DELETE_STORY".equals(command)) {
} else if ("DELETE_STORY".equals(command)) {
- Instance.getLibrary().delete(
"" +
args[0]);
+ Instance.getLibrary().delete(
(String)
args[0]);
} else if ("GET_COVER".equals(command)) {
} else if ("GET_COVER".equals(command)) {
- return Instance.getLibrary().getCover(
"" +
args[0]);
+ return Instance.getLibrary().getCover(
(String)
args[0]);
} else if ("GET_SOURCE_COVER".equals(command)) {
} else if ("GET_SOURCE_COVER".equals(command)) {
- return Instance.getLibrary().getSourceCover(
"" +
args[0]);
+ return Instance.getLibrary().getSourceCover(
(String)
args[0]);
} else if ("SET_SOURCE_COVER".equals(command)) {
} else if ("SET_SOURCE_COVER".equals(command)) {
- Instance.getLibrary().setSourceCover("" + args[0], "" + args[1]);
+ Instance.getLibrary().setSourceCover((String) args[0],
+ (String) args[1]);
} else if ("EXIT".equals(command)) {
stop(0, false);
}
} else if ("EXIT".equals(command)) {
stop(0, false);
}