killbill-uncached

Merge pull request #325 from lstephen/master Avoid NPE with

1/27/2016 7:30:57 PM

Details

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
index dc2af68..48d2446 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java
@@ -579,7 +579,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
             } catch (final InterruptedException e) {
                 return Response.status(Status.INTERNAL_SERVER_ERROR).build();
             } catch (final TimeoutException e) {
-                return Response.status(Status.fromStatusCode(408)).build();
+                return Response.status(408).build();
             } finally {
                 if (waiter != null) {
                     killbillHandler.unregisterCompletionUserRequestWaiter(waiter);