Improve buffer util

blueguyzhu · Jun 8, 2018 · 024d9cf · 024d9cf
1 parent 43ea946
commit 024d9cf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/org/traccar/helper/BufferUtil.java b/src/org/traccar/helper/BufferUtil.java
@@ -33,10 +33,10 @@ public static int indexOf(String needle, ByteBuf haystack) {
     }
 
     public static int indexOf(String needle, ByteBuf haystack, int startIndex, int endIndex) {
-        int index = ByteBufUtil.indexOf(
-                Unpooled.wrappedBuffer(needle.getBytes(StandardCharsets.US_ASCII)),
-                Unpooled.wrappedBuffer(haystack.array(), startIndex, endIndex - startIndex));
-        return (index != -1) ? (startIndex + index) : -1;
+        haystack = Unpooled.wrappedBuffer(haystack);
+        haystack.readerIndex(startIndex);
+        haystack.writerIndex(endIndex);
+        return indexOf(needle, haystack);
     }
 
 }