about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2008-08-04 16:14:43 +0000
committerKelly Rauchenberger <fefferburbia@gmail.com>2008-08-04 16:14:43 +0000
commit92f0a83a8d0c37524977908bd3447df1039f950f (patch)
tree7d08229e627e059c7f6b8d98147609db84ac24fc
parentb2664e4e0c8b0fdcfeaa46c6c2cc15edf1813738 (diff)
downloadinstadisc-92f0a83a8d0c37524977908bd3447df1039f950f.tar.gz
instadisc-92f0a83a8d0c37524977908bd3447df1039f950f.tar.bz2
instadisc-92f0a83a8d0c37524977908bd3447df1039f950f.zip
Client: Fixed up startup request retained
Previously, the XML-RPC request for the retained items would take place before the InstaDiscThread started, thus causing an error when the remote server attempted sending an item. Now it is run after the InstaDiscThread starts.
-rw-r--r--client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java10
-rw-r--r--client/trunk/src/com/fourisland/instadisc/InstaDiscView.java3
2 files changed, 8 insertions, 5 deletions
diff --git a/client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java b/client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java index eac82d9..e1705f1 100644 --- a/client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java +++ b/client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java
@@ -61,15 +61,15 @@ public class InstaDiscApp extends SingleFrameApplication {
61 } catch (NullPointerException ex) { 61 } catch (NullPointerException ex) {
62 notInit = true; 62 notInit = true;
63 } 63 }
64 64
65 if (notInit) { 65 if (notInit) {
66 Thread th = new Thread(new FirstRunWizard()); 66 Thread th = new Thread(new FirstRunWizard());
67 th.start(); 67 th.start();
68 } else { 68 } else {
69 XmlRpc xmlrpc = new XmlRpc("requestRetained"); 69 if ((args.length > 0) && (args[0].equals("-r"))) {
70 xmlrpc.execute(); 70 XmlRpc xmlrpc = new XmlRpc("requestRetained");
71 71 xmlrpc.execute();
72 if (!((args.length > 0) && (args[0].equals("-r")))) { 72 } else {
73 launch(InstaDiscApp.class, args); 73 launch(InstaDiscApp.class, args);
74 } 74 }
75 } 75 }
diff --git a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java index ad56681..12e1dbd 100644 --- a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java +++ b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java
@@ -115,6 +115,9 @@ public class InstaDiscView extends FrameView {
115 InstaDiscThread idt = new InstaDiscThread(); 115 InstaDiscThread idt = new InstaDiscThread();
116 Thread idtt = new Thread(idt); 116 Thread idtt = new Thread(idt);
117 idtt.start(); 117 idtt.start();
118
119 XmlRpc xmlrpc = new XmlRpc("requestRetained");
120 xmlrpc.execute();
118 } 121 }
119 122
120 @Action 123 @Action