make init call after constructing SDKManager. C3_BUILDER_WORK
authortimkelly
Fri, 03 Sep 2010 18:19:46 -0500
branchC3_BUILDER_WORK
changeset 1956 1717ddc431a9
parent 1955 d88e9de3a3db
make init call after constructing SDKManager.
core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SDKCorePlugin.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SDKCorePlugin.java	Fri Sep 03 18:19:14 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SDKCorePlugin.java	Fri Sep 03 18:19:46 2010 -0500
@@ -16,6 +16,7 @@
 import org.osgi.framework.BundleContext;
 
 import com.nokia.carbide.cpp.internal.api.sdk.SDKCacheUtils;
+import com.nokia.carbide.cpp.internal.sdk.core.model.AbstractSDKManager;
 import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManager;
 import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManagerRaptorOnly;
 import com.nokia.cpp.internal.api.utils.core.HostOS;
@@ -85,14 +86,18 @@
 	 * @return ISDKManager instance
 	 */
 	public static ISDKManager getSDKManager() {
+		
 		if (sdkManager == null) {
 			// TODO: SDKManagerRaptorOnly, currently only works on Linux
 			// ... and SDKManager depends on Windows
-			// Win32 can use this instead once ABLD support is dropped from Carbide
+			// Win32 can use this instead once ABLD support is dropped from
+			// Carbide
 			if (HostOS.IS_WIN32)
 				sdkManager = new SDKManager();
 			else
 				sdkManager = new SDKManagerRaptorOnly();
+			
+			((AbstractSDKManager)sdkManager).init();
 		}
 		return sdkManager;
 	}