Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A347F18B42 for ; Fri, 22 May 2015 12:28:01 +0000 (UTC) Received: (qmail 9029 invoked by uid 500); 22 May 2015 12:28:01 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 8954 invoked by uid 500); 22 May 2015 12:28:01 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 8943 invoked by uid 99); 22 May 2015 12:28:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 May 2015 12:28:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34CE3E0772; Fri, 22 May 2015 12:28:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <0b7d976102a8492499bda6e152b036da@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6380] Using Multivaluedmap.getFirst Date: Fri, 22 May 2015 12:28:01 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 029be16dd -> 6f3f4c1f8 [CXF-6380] Using Multivaluedmap.getFirst Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f3f4c1f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f3f4c1f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f3f4c1f Branch: refs/heads/master Commit: 6f3f4c1f873d8d30a4c30165280dd0ff46e03d5d Parents: 029be16 Author: Sergey Beryozkin Authored: Fri May 22 13:27:31 2015 +0100 Committer: Sergey Beryozkin Committed: Fri May 22 13:27:31 2015 +0100 ---------------------------------------------------------------------- .../cxf/jaxrs/tracing/htrace/HTraceProvider.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6f3f4c1f/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/jaxrs/tracing/htrace/HTraceProvider.java ---------------------------------------------------------------------- diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/jaxrs/tracing/htrace/HTraceProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/jaxrs/tracing/htrace/HTraceProvider.java index 57dc29a..a32f41c 100644 --- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/jaxrs/tracing/htrace/HTraceProvider.java +++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/jaxrs/tracing/htrace/HTraceProvider.java @@ -19,7 +19,6 @@ package org.apache.cxf.jaxrs.tracing.htrace; import java.io.IOException; -import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -95,20 +94,14 @@ public class HTraceProvider implements ContainerRequestFilter, ContainerResponse private static Long getFirstValueOrDefault(final MultivaluedMap headers, final String header, final long defaultValue) { - - if (!headers.containsKey(header)) { - return defaultValue; - } - - try { - final List< String > values = headers.get(header); - if (values != null && !values.isEmpty()) { - return Long.parseLong(values.get(0)); + String value = headers.getFirst(header); + if (value != null) { + try { + return Long.parseLong(value); + } catch (NumberFormatException ex) { + LOG.log(Level.FINE, String.format("Unable to parse '%s' header value to long number", header), ex); } - } catch (NumberFormatException ex) { - LOG.log(Level.FINE, String.format("Unable to parse '%s' header value to long number", header), ex); } - return defaultValue; } }