killbill-aplcache

fix NPEs

1/31/2012 4:26:34 PM

Details

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/inv_ent/TestBasic.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/inv_ent/TestBasic.java
index a8281d4..7f740da 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/inv_ent/TestBasic.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/inv_ent/TestBasic.java
@@ -88,7 +88,6 @@ public class TestBasic {
     @Inject
     private AccountService accountService;
 
-
     private EntitlementUserApi entitlementUserApi;
 
     private InvoiceUserApi invoiceUserApi;
diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
index 8d7592f..342c9cc 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
@@ -104,29 +104,29 @@ public class SubscriptionData implements Subscription {
 
     @Override
     public SubscriptionState getState() {
-        return (transitions == null) ? null : getLatestTranstion().getNextState();
+        return (getLatestTransition() == null) ? null : getLatestTransition().getNextState();
     }
 
     @Override
     public PlanPhase getCurrentPhase() {
-        return (transitions == null) ? null : getLatestTranstion().getNextPhase();
+        return (getLatestTransition() == null) ? null : getLatestTransition().getNextPhase();
     }
 
 
     @Override
     public Plan getCurrentPlan() {
-        return (transitions == null) ? null : getLatestTranstion().getNextPlan();
+        return (getLatestTransition() == null) ? null : getLatestTransition().getNextPlan();
     }
 
     @Override
     public String getCurrentPriceList() {
-        return (transitions == null) ? null : getLatestTranstion().getNextPriceList();
+        return (getLatestTransition() == null) ? null : getLatestTransition().getNextPriceList();
     }
 
 
     @Override
     public DateTime getEndDate() {
-        SubscriptionTransition latestTransition = getLatestTranstion();
+        SubscriptionTransition latestTransition = getLatestTransition();
         if (latestTransition.getNextState() == SubscriptionState.CANCELLED) {
             return latestTransition.getEffectiveTransitionTime();
         }
@@ -200,7 +200,7 @@ public class SubscriptionData implements Subscription {
         return null;
     }
 
-    public SubscriptionTransition getLatestTranstion() {
+    public SubscriptionTransition getLatestTransition() {
 
         if (transitions == null) {
             return null;