Author: markt
Date: Mon Nov 30 18:21:53 2015
New Revision: 1717301
URL: http://svn.apache.org/viewvc?rev=1717301&view=rev
Log:
Java 6, not Java 7.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterRequest.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterRequest.java?rev=1717301&r1=1717300&r2=1717301&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterRequest.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterRequest.java Mon
Nov 30 18:21:53 2015
@@ -48,7 +48,7 @@ public class TesterRequest extends Reque
servletContext = new TesterServletContext();
context.setServletContext(servletContext);
if (withSession) {
- Set<SessionTrackingMode> modes = new HashSet<>();
+ Set<SessionTrackingMode> modes = new
HashSet<SessionTrackingMode>();
modes.add(SessionTrackingMode.URL);
modes.add(SessionTrackingMode.COOKIE);
servletContext.setSessionTrackingModes(modes);
@@ -108,11 +108,11 @@ public class TesterRequest extends Reque
return method;
}
- private final Map<String,List<String>> headers = new HashMap<>();
+ private final Map<String,List<String>> headers = new
HashMap<String,List<String>>();
public void addHeader(String name, String value) {
List<String> values = headers.get(name);
if (values == null) {
- values = new ArrayList<>();
+ values = new ArrayList<String>();
headers.put(name, values);
}
values.add(value);
@@ -129,7 +129,7 @@ public class TesterRequest extends Reque
public Enumeration<String> getHeaders(String name) {
List<String> values = headers.get(name);
if (values == null || values.size() == 0) {
- return Collections.emptyEnumeration();
+ values = Collections.emptyList();
}
return Collections.enumeration(headers.get(name));
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java?rev=1717301&r1=1717300&r2=1717301&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java
Mon Nov 30 18:21:53 2015
@@ -266,7 +266,8 @@ public class TesterServletContext implem
return sessionCookieConfig;
}
- private final Set<SessionTrackingMode> sessionTrackingModes = new
HashSet<>();
+ private final Set<SessionTrackingMode> sessionTrackingModes =
+ new HashSet<SessionTrackingMode>();
@Override
public void setSessionTrackingModes(
Set<SessionTrackingMode> sessionTrackingModes) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
