Author: markt
Date: Sun Aug 12 15:53:59 2012
New Revision: 1372137
URL: http://svn.apache.org/viewvc?rev=1372137&view=rev
Log:
Java 7 changes
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1372137&r1=1372136&r2=1372137&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Sun
Aug 12 15:53:59 2012
@@ -1036,8 +1036,7 @@ public class TestAsyncContextImpl extend
tomcat.start();
// Call the servlet once
- Map<String,List<String>> headers =
- new LinkedHashMap<String,List<String>>();
+ Map<String,List<String>> headers = new LinkedHashMap<>();
ByteChunk bc = new ByteChunk();
int rc = getUrl("http://localhost:"; + getPort() + "/", bc, headers);
assertEquals(200, rc);
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1372137&r1=1372136&r2=1372137&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Sun Aug
12 15:53:59 2012
@@ -251,8 +251,8 @@ public class TestStandardWrapper extends
ByteChunk bc = new ByteChunk();
Map<String,List<String>> reqHeaders = null;
if (useRole) {
- reqHeaders = new HashMap<String,List<String>>();
- List<String> authHeaders = new ArrayList<String>();
+ reqHeaders = new HashMap<>();
+ List<String> authHeaders = new ArrayList<>();
// testUser, testPwd
authHeaders.add("Basic dGVzdFVzZXI6dGVzdFB3ZA==");
reqHeaders.put("Authorization", authHeaders);
@@ -387,7 +387,7 @@ public class TestStandardWrapper extends
threads[i].join();
}
- Set<String> servlets = new HashSet<String>();
+ Set<String> servlets = new HashSet<>();
// Output the result
for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) {
System.out.println(threads[i].getResult());
@@ -434,7 +434,7 @@ public class TestStandardWrapper extends
threads[i].join();
}
- Set<String> servlets = new HashSet<String>();
+ Set<String> servlets = new HashSet<>();
// Output the result
for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) {
System.out.println(threads[i].getResult());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
