609706 - Logic in nsSessionStore.init is unnecessarily complex

Status: RESOLVED FIXED

(Firefox :: Session Restore, defect)

Description

[Paul O'Shannessy [:zpao] (not bugmail, email directly)]

We have 2 conditions going down the same path with more conditions to differentiate those 2 conditions, just so we can hit the same return statement. That makes the code more difficult than it needs to be.

Comment 1

[Michael Kohler [:mkohler]]

Do you mean http://mxr.mozilla.org/mozilla-central/source/browser/components/sessionstore/src/SessionStore.jsm#482 ? If so, I think that we could just remove http://mxr.mozilla.org/mozilla-central/source/browser/components/sessionstore/src/SessionStore.jsm#497 since |this.unload(aWindow)| does set the state to RUNNING if it was STOPPED before (http://mxr.mozilla.org/mozilla-central/source/browser/components/sessionstore/src/SessionStore.jsm#667). Is this the correct approach?

Comment 2

[Tim Taubert [:ttaubert] (inactive)]

This looks much better now due to recent rewrites.