killbill-memoizeit

Merge branch 'release-0.12.x' of github.com:killbill/killbill

11/11/2014 9:43:11 PM

Details

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
index 6ffc71a..56cef94 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
@@ -749,6 +749,10 @@ public class AccountResource extends JaxRsResourceBase {
             default:
                 return Response.status(Status.PRECONDITION_FAILED).entity("TransactionType " + transactionType + " is not allowed for an account").build();
         }
+        // Aborted payment?
+        if (result == null) {
+            return Response.noContent().build();
+        }
         return uriBuilder.buildResponse(PaymentResource.class, "getPayment", result.getId(), uriInfo.getBaseUri().toString());
     }
 

pom.xml 2(+1 -1)

diff --git a/pom.xml b/pom.xml
index 7768d25..2c63d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.9.1</version>
+        <version>0.9.2</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.12.1-SNAPSHOT</version>