From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 1 Jul 2011 22:44:04 +0000 (+0000)
Subject: Prevent test failures when two objects get generated with the same hashCode
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e0d0018bd2541a193bbf296c589160859aac9d66;p=tomcat7.0

Prevent test failures when two objects get generated with the same hashCode

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1142111 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java b/test/org/apache/catalina/core/TestStandardWrapper.java
index d8159abff..4f3314404 100644
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
@@ -335,6 +336,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
     public static final int BUG51445_THREAD_COUNT = 5;
     
     public static CountDownLatch latch = null;
+    public static AtomicInteger counter = new AtomicInteger(0);
 
     public void testBug51445AddServlet() throws Exception {
 
@@ -459,6 +461,14 @@ public class TestStandardWrapper extends TomcatBaseTest {
         private static final long LATCH_TIMEOUT = 60;
 
         private int data = 0;
+        private int counter;
+        
+        public Bug51445Servlet() {
+            // Use this rather than hashCode since in some environments,
+            // multiple instances of this object were created with the same
+            // hashCode
+            counter = TestStandardWrapper.counter.incrementAndGet();
+        }
 
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp)
@@ -481,7 +491,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
                 resp.getWriter().print("Latch await failed");
             }
             resp.getWriter().print(",");
-            resp.getWriter().print(hashCode());
+            resp.getWriter().print(counter);
         }
 
         @Override