Fix compile/checktyle issues after merges
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ec5a2135 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ec5a2135 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ec5a2135 Branch: refs/heads/2.7.x-fixes Commit: ec5a2135a31395f82d09c78a0b7efee4ded8a110 Parents: 39fde3b Author: Daniel Kulp <[email protected]> Authored: Fri Oct 30 11:22:09 2015 -0400 Committer: Daniel Kulp <[email protected]> Committed: Fri Oct 30 11:22:09 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/transport/http/Headers.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ec5a2135/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java index 310fa2a..7c562c0 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java @@ -26,9 +26,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; import java.util.logging.Level; @@ -38,6 +40,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.HttpHeaderHelper; import org.apache.cxf.message.Message; @@ -58,7 +61,6 @@ public class Headers { public static final String HTTP_HEADERS_LINK = "Link"; public static final String EMPTY_REQUEST_PROPERTY = "org.apache.cxf.empty.request"; private static final String SET_EMPTY_REQUEST_CT_PROPERTY = "set.content.type.for.empty.request"; - private static final TimeZone TIME_ZONE_GMT = TimeZone.getTimeZone("GMT"); private static final Logger LOG = LogUtils.getL7dLogger(Headers.class); /** @@ -72,7 +74,6 @@ public class Headers { HTTP_HEADERS_SINGLE_VALUE_ONLY.add(HTTP_HEADERS_LINK); } - private static final Logger LOG = LogUtils.getL7dLogger(Headers.class); private final Message message; private final Map<String, List<String>> headers;
