diff -r d5e927d5853b -r 7cee158cb8cd javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/InstallationNotifier.java --- a/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/InstallationNotifier.java Tue Sep 14 21:06:50 2010 +0300 +++ b/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/InstallationNotifier.java Wed Sep 15 12:05:25 2010 +0300 @@ -47,7 +47,7 @@ // Maximum number of progress updates to SysUtil.setProperty(). private static final int MAX_PROPERTY_PROGRESS_UPDATES = 5; // Maximum number of progress updates to SIF. - private static final int MAX_SIF_PROGRESS_UPDATES = 5; + private static final int MAX_SIF_PROGRESS_UPDATES = 8; // Maximum number of progress updates to UI. private static final int MAX_UI_PROGRESS_UPDATES = 20; @@ -132,18 +132,6 @@ public void ended() { Log.log("InstallationNotifier.ended"); - if (iInstallerUi != null) - { - try - { - iInstallerUi.ended(); - } - catch (Throwable t) - { - Log.logError( - "InstallationNotifier: InstallerUi.ended threw exception", t); - } - } if (iSifNotifier != null) { // After this SifNotifier is no longer used, destroy it. @@ -157,6 +145,18 @@ Log.logError("InstallationNotifier: SifNotifier.destroy failed", t); } } + if (iInstallerUi != null) + { + try + { + iInstallerUi.ended(); + } + catch (Throwable t) + { + Log.logError( + "InstallationNotifier: InstallerUi.ended threw exception", t); + } + } } /**