|
Lines 229-235
Link Here
|
| 229 |
|
229 |
|
| 230 |
if (packedRef == null) { |
230 |
if (packedRef == null) { |
| 231 |
//no pack.gz on server, get normal jar |
231 |
//no pack.gz on server, get normal jar |
| 232 |
return asLocalReference(reference, monitor); |
232 |
ContentReference contentReference = null; |
|
|
233 |
try { |
| 234 |
contentReference = asLocalReference(reference, monitor); |
| 235 |
} |
| 236 |
catch (FileNotFoundException e) { |
| 237 |
contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e); |
| 238 |
} |
| 239 |
catch (IOException e) { |
| 240 |
contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e); |
| 241 |
} |
| 242 |
catch (CoreException e) { |
| 243 |
contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e); |
| 244 |
} |
| 245 |
return contentReference; |
| 233 |
} |
246 |
} |
| 234 |
|
247 |
|
| 235 |
boolean success = false; |
248 |
boolean success = false; |
|
Lines 253-259
Link Here
|
| 253 |
monitor.showCopyDetails(false); |
266 |
monitor.showCopyDetails(false); |
| 254 |
} |
267 |
} |
| 255 |
//unpacking the jar will strip the ".pack.gz" and leave us back with the original filename |
268 |
//unpacking the jar will strip the ".pack.gz" and leave us back with the original filename |
| 256 |
processor.processJar(packedFile); |
269 |
try { |
|
|
270 |
processor.processJar(packedFile); |
| 271 |
} catch (Throwable e) { |
| 272 |
//something is wrong unpacking |
| 273 |
} |
| 257 |
|
274 |
|
| 258 |
if(tempFile.exists() && tempFile.length() > 0){ |
275 |
if(tempFile.exists() && tempFile.length() > 0){ |
| 259 |
success = true; |
276 |
success = true; |
|
Lines 271-277
Link Here
|
| 271 |
} |
288 |
} |
| 272 |
if(!success){ |
289 |
if(!success){ |
| 273 |
//Something went wrong with the unpack, get the normal jar. |
290 |
//Something went wrong with the unpack, get the normal jar. |
| 274 |
return asLocalReference(reference, monitor); |
291 |
ContentReference contentReference = null; |
|
|
292 |
try { |
| 293 |
contentReference = asLocalReference(reference, monitor); |
| 294 |
} |
| 295 |
catch (FileNotFoundException e) { |
| 296 |
contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e); |
| 297 |
} |
| 298 |
catch (IOException e) { |
| 299 |
contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e); |
| 300 |
} |
| 301 |
catch (CoreException e) { |
| 302 |
contentReference = continueOnErrorOrRethrow(reference.getIdentifier(), e); |
| 303 |
} |
| 304 |
return contentReference; |
| 275 |
} |
305 |
} |
| 276 |
return packedRef; |
306 |
return packedRef; |
| 277 |
} |
307 |
} |
