flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject git commit: [flex-utilities] [refs/heads/develop] - stopped unable to clean up temp directory message showing when it has not been created (for instance when you have no internet access)
Date Sun, 06 Jul 2014 03:33:28 GMT
Repository: flex-utilities
Updated Branches:
  refs/heads/develop 6dd5b121f -> e7c205173


stopped unable to clean up temp directory message showing when it has not been created (for
instance when you have no internet access)


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e7c20517
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e7c20517
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e7c20517

Branch: refs/heads/develop
Commit: e7c205173ec3248e968a9446eea2b68ddbe11114
Parents: 6dd5b12
Author: Justin Mclean <jmclean@apache.org>
Authored: Sun Jul 6 13:33:14 2014 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Sun Jul 6 13:33:14 2014 +1000

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e7c20517/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 3e848b1..8929daa 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -399,7 +399,9 @@ variables are not required because the locations of these pieces are known.
 				}
 			}
 			if (hasInternet)
+			{
 				loadXML();
+			}
             logVersion();
 			if (!hasInternet)
 			{
@@ -2260,10 +2262,13 @@ variables are not required because the locations of these pieces are
known.
 			cleanedUp = true;
 			
             CursorManager.removeBusyCursor();
-            if (!_viewResourceConstants)
+            if (!_viewResourceConstants) {
                 selectDefaultLanguageInEmergency();
+			}
             try {
-				_flexTempDir.deleteDirectory(true);
+				if (_flexTempDir) {
+					_flexTempDir.deleteDirectory(true);
+				}
 			} catch (e:Error) {
     			log(_viewResourceConstants.ERROR_UNABLE_TO_DELETE_TEMP_DIRECTORY);
 			}


Mime
View raw message