killbill-memoizeit

Fix NPE in profiling code

8/4/2014 2:33:33 PM

stephane brossier

Commit: e423b38

Tree: e3d04de

Parents: eed657e

Changes

profiles/killbill/src/main/java/org/killbill/billing/server/filters/ProfilingContainerResponseFilter.java 2(+1 -1)

Details

profiles/killbill/src/main/java/org/killbill/billing/server/filters/ProfilingContainerResponseFilter.java 2(+1 -1)

diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/filters/ProfilingContainerResponseFilter.java b/profiles/killbill/src/main/java/org/killbill/billing/server/filters/ProfilingContainerResponseFilter.java
index a13e490..0a35b4a 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/filters/ProfilingContainerResponseFilter.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/filters/ProfilingContainerResponseFilter.java
@@ -52,7 +52,7 @@ public class ProfilingContainerResponseFilter implements ContainerRequestFilter,
     public ContainerRequest filter(final ContainerRequest request) {
 
         final List<String> profilingHeaderRequests = request.getRequestHeader(PROFILING_HEADER_REQ);
-        final String profilingHeaderRequest = profilingHeaderRequests.isEmpty() ? null : profilingHeaderRequests.get(0);
+        final String profilingHeaderRequest = (profilingHeaderRequests == null || profilingHeaderRequests.isEmpty()) ? null : profilingHeaderRequests.get(0);
         if (profilingHeaderRequest != null) {
             try {
                 Profiling.setPerThreadProfilingData(profilingHeaderRequest);