1416254 - Remove conditional catch consumers in uriloader/.

Status: RESOLVED FIXED

(Firefox :: File Handling, enhancement)

Description

[Tooru Fujisawa [:arai]]

non-standard conditional catch syntax is going to be removed in bug 1228841.

there are 2 cases for replacement.

case 1: only conditional catch

from:
  try {
    A
  } catch (e if cond) {
    B
  }
to
  try {
    A
  } catch (e) {
    if (!cond) {
      throw e;
    }
    B
  }

case 2: conditional catch and unconditional catch

from:
  try {
    A
  } catch (e if cond) {
    B
  } catch {
    C
  }
to
  try {
    A
  } catch (e) {
    if (cond) {
      B
    } else {
      C
    }
  }

Comment 1

[Tooru Fujisawa [:arai]]

Attachment: Remove conditional catch consumers in uriloader/.

Comment 2

[Marco Bonardo [:mak]]

Comment on attachment 8928554 [details] [diff] [review]
Remove conditional catch consumers in uriloader/.

Review of attachment 8928554 [details] [diff] [review]:
-----------------------------------------------------------------

::: uriloader/exthandler/tests/unit/test_badMIMEType.js
@@ +17,5 @@
>                 getService(Ci.nsIMIMEService).
>                 getFromTypeAndExtension(badMimeType, "txt");
> +  } catch (e) {
> +    if (!(e instanceof Ci.nsIException &&
> +          e.result == Cr.NS_ERROR_NOT_AVAILABLE)) {

nit: for all the three cases here, I'd prefer the
if (!e instanceof ... || e.result != ...)

Comment 3

[Marco Bonardo [:mak]]

ehr, you should still wrap (e instanceof ..) in parenthesis

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/5d44a5636d44
Remove conditional catch consumers in uriloader/. r=mak

Comment 5

[Tooru Fujisawa [:arai]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/5d44a5636d44d0a8797aac01c922d01d8e0a6a5c
Bug 1416254 - Remove conditional catch consumers in uriloader/. r=mak

Comment 6

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/5d44a5636d44