From b06dd882bf7b8e2067240d5957315499836138c8 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sun, 2 Oct 2022 11:15:46 -0700
Subject: Update Java dependencies

---
 src/main/java/org/traccar/helper/BufferUtil.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/org/traccar/helper/BufferUtil.java b/src/main/java/org/traccar/helper/BufferUtil.java
index 0dbe0a4ad..d1025f548 100644
--- a/src/main/java/org/traccar/helper/BufferUtil.java
+++ b/src/main/java/org/traccar/helper/BufferUtil.java
@@ -59,16 +59,16 @@ public final class BufferUtil {
     }
 
     public static int indexOf(ByteBuf needle, ByteBuf haystack, int startIndex, int endIndex) {
-        ByteBuf wrappedHaystack;
-        if (startIndex == haystack.readerIndex() && endIndex == haystack.writerIndex()) {
-            wrappedHaystack = haystack;
-        } else {
-            wrappedHaystack = Unpooled.wrappedBuffer(haystack);
-            wrappedHaystack.readerIndex(startIndex - haystack.readerIndex());
-            wrappedHaystack.writerIndex(endIndex - haystack.readerIndex());
+        int originalReaderIndex = haystack.readerIndex();
+        int originalWriterIndex = haystack.writerIndex();
+        try {
+            haystack.readerIndex(startIndex);
+            haystack.writerIndex(endIndex);
+            return ByteBufUtil.indexOf(needle, haystack);
+        } finally {
+            haystack.readerIndex(originalReaderIndex);
+            haystack.writerIndex(originalWriterIndex);
         }
-        int result = ByteBufUtil.indexOf(needle, wrappedHaystack);
-        return result < 0 ? result : startIndex + result;
     }
 
 }
-- 
cgit v1.2.3