Make sure OS version is never set to 0 when loading SDK from cache. C3_BUILDER_WORK
authorstechong
Fri, 30 Jul 2010 13:10:27 -0500
branchC3_BUILDER_WORK
changeset 1732 c408456e415f
parent 1731 9ad7e7b04120
child 1733 13355a75b65c
Make sure OS version is never set to 0 when loading SDK from cache.
core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java	Fri Jul 30 12:13:13 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java	Fri Jul 30 13:10:27 2010 -0500
@@ -310,9 +310,13 @@
 			SDKManagerCacheEntry entry = getSDKCacheEntry(id);
 			ISymbianSDK sdk = getSDK(id, false);
 			if (sdk == null) {
+				Version osVersion = new Version(entry.getOsVersion());
+				if (osVersion.getMajor() == 0) {
+					osVersion = new Version("9.5");
+				}
 				sdk = SymbianSDKFactory.createInstance(id, 
 						   entry.getEpocRoot(),
-						   new Version(entry.getOsVersion()));
+						   osVersion);
 				((SymbianSDK)sdk).setEnabled(entry.isEnabled());
 				synchronized (sdkList) {
 					sdkList.add(sdk);