210 |
Version w = load(current, arr); |
Version w = load(current, arr); |
211 |
if(!v.equals(w)) throw new Error("Versions didn't match"); |
if(!v.equals(w)) throw new Error("Versions didn't match"); |
212 |
} catch(Throwable t) { |
} catch(Throwable t) { |
213 |
|
// re-add |
214 |
bos = new ByteArrayOutputStream(); |
bos = new ByteArrayOutputStream(); |
215 |
fmt.writeVersion(bos, v); |
fmt.writeVersion(bos, v); |
216 |
ms.addDatum(bos.toByteArray(), |
Mediaserver.Id nid = ms.addDatum(bos.toByteArray(), |
217 |
versionContentType, current); |
versionContentType, current); |
218 |
|
if(!nid.equals(current)) |
219 |
|
throw new Error("AAAAAAAAAAAAAAAAAAAAAAAAAAAAARGH!!!"); |
220 |
if(true) { |
if(true) { |
221 |
pa("============ CORRECT ============="); |
pa("============ CORRECT ============="); |
222 |
pa(new String(bos.toByteArray())); |
pa(new String(bos.toByteArray())); |
223 |
pa("=================================="); |
pa("=================================="); |
224 |
} |
} |
225 |
t.printStackTrace(); |
t.printStackTrace(); |
226 |
throw new Error("Problem with re-loading: "+t); |
//throw new Error("Problem with re-loading: "+t); |
227 |
|
// XXX not until demo is over-- client doesn't close |
228 |
|
// if error is thrown |
229 |
} |
} |
230 |
} |
} |
231 |
} |
} |