Fixed NULL pointer exception.

1 files changed, 11 insertions, 9 deletions

diff --git a/org.rtems.cdt/src/org/rtems/cdt/Storage.java b/org.rtems.cdt/src/org/rtems/cdt/Storage.java
index 6218401..745d7dd 100644
--- a/org.rtems.cdt/src/org/rtems/cdt/Storage.java
+++ b/org.rtems.cdt/src/org/rtems/cdt/Storage.java
@@ -66,7 +66,7 @@ public class Storage {
 
 	public static String getPristineProperty( IProject project, String key) {
 		String value = null;
-
+		
 		try {
 			value = project.getPersistentProperty( new QualifiedName( "", key));
 		} catch (CoreException e) {
@@ -78,7 +78,7 @@ public class Storage {
 
 	public static String getProperty( IProject project, String key) {
 		String value = getPristineProperty( project, key);
-
+	
 		if (value == null) {
 			if (key.startsWith( Constants.TOOL_KEY_PREFIX)) {
 				changePlatform( project, Constants.PLATFORM_DEFAULT);
@@ -331,18 +331,20 @@ public class Storage {
 				"make output parse error: " + e.getMessage()
 			);
 		} finally {
-			while (true) {
-				try {
-					p.waitFor();
-					break;
-				} catch (InterruptedException e) {
-					continue;
+			if (p != null) {
+				while (true) {
+					try {
+						p.waitFor();
+						break;
+					} catch (InterruptedException e) {
+						continue;
+					}
 				}
 			}
 		}
 		
 		// Check exit status
-		if (p.exitValue() != 0) {
+		if (p != null && p.exitValue() != 0) {
 			error = true;
 			createMarker(
 				project,