Removing dead code and adding additional logging to http/https call on the installer config download.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/ff96b1fa Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/ff96b1fa Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/ff96b1fa Branch: refs/heads/master Commit: ff96b1fac2a2728741554e0e48534f3182a9d278 Parents: d1951a3 Author: quetwo <n...@theflexgroup.org> Authored: Fri Feb 6 18:00:20 2015 -0500 Committer: quetwo <n...@theflexgroup.org> Committed: Fri Feb 6 18:00:20 2015 -0500 ---------------------------------------------------------------------- installer/src/InstallApacheFlex.mxml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/ff96b1fa/installer/src/InstallApacheFlex.mxml ---------------------------------------------------------------------- diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml index bf79c9c..341f060 100644 --- a/installer/src/InstallApacheFlex.mxml +++ b/installer/src/InstallApacheFlex.mxml @@ -425,12 +425,13 @@ variables are not required because the locations of these pieces are known. { loadXML(); } - logVersion(); - if (!hasInternet) + + else { log("Internet connection unavailable"); abortInstallation("Internet connection unavailable."); } + logVersion(); } private function uncaughtErrorHandler(event:UncaughtErrorEvent):void @@ -1213,7 +1214,7 @@ variables are not required because the locations of these pieces are known. loader.dataFormat = URLLoaderDataFormat.TEXT; loader.addEventListener(Event.COMPLETE, handleInstallerXMLLoaded); loader.addEventListener(ErrorEvent.ERROR, handleInstallerXMLError); - loader.addEventListener(IOErrorEvent.IO_ERROR, handleInstallerXMLError); + loader.addEventListener(IOErrorEvent.IO_ERROR, handleInstallIOXMLError); loader.load(req); } @@ -1269,7 +1270,6 @@ variables are not required because the locations of these pieces are known. _installerComponentsDataProvider.addItem(vo); } usingXML = true; - // progressLabels = data.progressLabels[0]; installStepsData = data.steps.step; var strings:XMLList = data.strings.string; for each (var x:XML in strings) @@ -1324,6 +1324,13 @@ variables are not required because the locations of these pieces are known. abortInstallation("Unable to load " + APACHE_FLEX_BIN_INSTALLER_URL); } + protected function handleInstallIOXMLError(event:IOErrorEvent):void + { + // Stream Error 2032 here means that the SSL connection can't be created. TLS/SSL error? + log("Unable to load " + APACHE_FLEX_BIN_INSTALLER_URL + " with " + event.text); + abortInstallation("Unable to load " + APACHE_FLEX_BIN_INSTALLER_URL); + } + protected function showDefaultState():void { zeroStepGroup.visible = true; @@ -2825,17 +2832,6 @@ variables are not required because the locations of these pieces are known. { var selectedItem:InstallerComponentVO = InstallerComponentVO(event.target.selectedItem); optionalInstallsTxtArea.text = selectedItem.message; - /*installChkBx.label = _viewResourceConstants.INSTALL_AGREE; - if (selectedItem.answered) { - if (selectedItem.selected) { - installChkBx.selected = true; - } else { - installChkBx.selected = false; - } - } else { - installChkBx.selected = false; - }*/ - licenseLinkBtn.includeInLayout = true; _currentLicenseLabel = selectedItem.licenseName; _currentLicenseURL = selectedItem.licenseURL;
