Revision eeedb131
Added by Cherian Mathew over 8 years ago
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/monitor/RemotingProgressMonitor.java | ||
---|---|---|
9 | 9 |
*/ |
10 | 10 |
package eu.etaxonomy.cdm.common.monitor; |
11 | 11 |
|
12 |
import java.io.Serializable; |
|
12 | 13 |
import java.util.ArrayList; |
13 | 14 |
import java.util.List; |
14 | 15 |
|
... | ... | |
20 | 21 |
*/ |
21 | 22 |
public class RemotingProgressMonitor extends RestServiceProgressMonitor implements IRemotingProgressMonitor { |
22 | 23 |
|
23 |
private Object result;
|
|
24 |
private Serializable result;
|
|
24 | 25 |
private List<String> reports = new ArrayList<String>(); |
25 | 26 |
private String owner; |
26 |
private Object feedback; |
|
27 |
private Serializable feedback; |
|
28 |
private transient Object feedbackLock; |
|
27 | 29 |
private boolean isWaitingForFeedback = false; |
28 | 30 |
|
29 | 31 |
|
... | ... | |
40 | 42 |
* {@inheritDoc} |
41 | 43 |
*/ |
42 | 44 |
@Override |
43 |
public void setResult(Object result) {
|
|
45 |
public void setResult(Serializable result) {
|
|
44 | 46 |
this.result = result; |
45 | 47 |
} |
46 | 48 |
|
... | ... | |
63 | 65 |
} |
64 | 66 |
|
65 | 67 |
|
66 |
|
|
67 | 68 |
/** |
68 | 69 |
* {@inheritDoc} |
69 | 70 |
*/ |
... | ... | |
86 | 87 |
*/ |
87 | 88 |
@Override |
88 | 89 |
public void waitForFeedback() { |
89 |
synchronized (feedback) { |
|
90 |
if(feedbackLock == null) { |
|
91 |
feedbackLock = new Object(); |
|
92 |
} |
|
93 |
synchronized (feedbackLock) { |
|
90 | 94 |
feedback = null; |
91 | 95 |
while(feedback == null) { |
92 | 96 |
isWaitingForFeedback = true; |
93 | 97 |
try { |
94 |
feedback.wait(); |
|
98 |
feedbackLock.wait();
|
|
95 | 99 |
} catch (InterruptedException ie) { |
96 | 100 |
throw new IllegalStateException(ie); |
97 | 101 |
} |
... | ... | |
99 | 103 |
} |
100 | 104 |
} |
101 | 105 |
|
102 |
|
|
103 |
|
|
104 | 106 |
/** |
105 | 107 |
* {@inheritDoc} |
106 | 108 |
*/ |
107 | 109 |
@Override |
108 |
public void setFeedback(Object feedback) {
|
|
109 |
synchronized (feedback) { |
|
110 |
public void setFeedback(Serializable feedback) {
|
|
111 |
synchronized (feedbackLock) {
|
|
110 | 112 |
this.feedback = feedback; |
111 |
this.feedback.notifyAll(); |
|
113 |
this.feedbackLock.notifyAll();
|
|
112 | 114 |
isWaitingForFeedback = false; |
113 |
} |
|
115 |
} |
|
116 |
} |
|
114 | 117 |
|
118 |
|
|
119 |
/** |
|
120 |
* {@inheritDoc} |
|
121 |
*/ |
|
122 |
@Override |
|
123 |
public Serializable getFeedback() { |
|
124 |
return feedback; |
|
115 | 125 |
} |
116 | 126 |
|
117 | 127 |
/** |
... | ... | |
122 | 132 |
return isWaitingForFeedback; |
123 | 133 |
} |
124 | 134 |
|
125 |
|
|
126 | 135 |
} |
Also available in: Unified diff
#5297 Make result, feedback objects in remoting monitor serializable, Update test service with monitor feedback