From 9af7512c359f93083c4894607e9a45e941bd2112 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Sat, 7 Jul 2012 13:30:28 +0900
Subject: [PATCH] Use String.CASE_INSENSITIVE_ORDER instead of custom
 Comparator

---
 .../netty/handler/codec/http/HttpHeaders.java |  6 +--
 .../util/internal/CaseIgnoringComparator.java | 39 -------------------
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 common/src/main/java/io/netty/util/internal/CaseIgnoringComparator.java

diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java
index 86a411f524..a29d87199a 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java
@@ -15,8 +15,6 @@
  */
 package io.netty.handler.codec.http;
 
-import io.netty.util.internal.CaseIgnoringComparator;
-
 import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
@@ -1134,8 +1132,8 @@ public class HttpHeaders {
     }
 
     Set<String> getHeaderNames() {
-        Set<String> names =
-            new TreeSet<String>(CaseIgnoringComparator.INSTANCE);
+
+        Set<String> names = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
 
         Entry e = head.after;
         while (e != head) {
diff --git a/common/src/main/java/io/netty/util/internal/CaseIgnoringComparator.java b/common/src/main/java/io/netty/util/internal/CaseIgnoringComparator.java
deleted file mode 100644
index 5c9471d086..0000000000
--- a/common/src/main/java/io/netty/util/internal/CaseIgnoringComparator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.util.internal;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-public final class CaseIgnoringComparator implements Comparator<String>, Serializable {
-
-    private static final long serialVersionUID = 4582133183775373862L;
-
-    public static final CaseIgnoringComparator INSTANCE = new CaseIgnoringComparator();
-
-    private CaseIgnoringComparator() {
-    }
-
-    @Override
-    public int compare(String o1, String o2) {
-        return o1.compareToIgnoreCase(o2);
-    }
-
-    @SuppressWarnings("static-method")
-    private Object readResolve() {
-        return INSTANCE;
-    }
-}