From: Bill Kuker <bkuker@billkuker.com>
Date: Mon, 8 Nov 2010 03:01:07 +0000 (+0000)
Subject: Fixed another possible NPE
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5aede255535c50325aee2e8b0924e888e72929ea;p=sw%2Fmotorsim

Fixed another possible NPE
---

diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java
index ab77759..9caa7ba 100644
--- a/src/com/billkuker/rocketry/motorsim/RocketScience.java
+++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java
@@ -122,13 +122,15 @@ public class RocketScience {
 	}
 
 	public static <T extends Quantity> String ammountToString(Amount<T> a) {
+		if ( a == null )
+			return "Null";
 		final NumberFormat nf = new DecimalFormat("##########.###");
 		return nf.format(a.doubleValue(a.getUnit())) + " " + a.getUnit();
 	}
 	
 	public static <T extends Quantity> String ammountToRoundedString(Amount<T> a) {
 		if (a == null)
-			return "NULL";
+			return "Null";
 		Unit<T> u = RocketScience.UnitPreference.preference.getPreferredUnit(a
 				.getUnit());
 		double d = a.doubleValue(u);