Author: markt
Date: Tue Aug 28 19:38:48 2012
New Revision: 1378281
URL: http://svn.apache.org/viewvc?rev=1378281&view=rev
Log:
Clean up for test tree
- mainly Java 7 <>
- fix remaining Eclipse warnings
FindBugs still TODO
Modified:
tomcat/trunk/test/javax/el/TestBeanELResolverVarargsInvocation.java
tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java
tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterThreadScopedHolder.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
Modified: tomcat/trunk/test/javax/el/TestBeanELResolverVarargsInvocation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestBeanELResolverVarargsInvocation.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestBeanELResolverVarargsInvocation.java
(original)
+++ tomcat/trunk/test/javax/el/TestBeanELResolverVarargsInvocation.java Tue Aug
28 19:38:48 2012
@@ -55,8 +55,7 @@ public class TestBeanELResolverVarargsIn
beanELResolver = new BeanELResolver();
elContext = new ELContext() {
private VariableMapper variableMapper = new VariableMapper() {
- private Map<String, ValueExpression> vars =
- new HashMap<String, ValueExpression>();
+ private Map<String, ValueExpression> vars = new HashMap<>();
@Override
public ValueExpression setVariable(String arg0,
Modified: tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java (original)
+++ tomcat/trunk/test/javax/servlet/http/TestHttpServlet.java Tue Aug 28
19:38:48 2012
@@ -48,8 +48,7 @@ public class TestHttpServlet extends Tom
tomcat.start();
- Map<String,List<String>> resHeaders=
- new HashMap<String, List<String>>();
+ Map<String,List<String>> resHeaders= new HashMap<>();
int rc = headUrl("http://localhost:"; + getPort() + "/", new
ByteChunk(),
resHeaders);
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Tue Aug 28
19:38:48 2012
@@ -479,7 +479,8 @@ public class TestRequest extends TomcatB
PrintWriter out = resp.getWriter();
- TreeMap<String,String[]> parameters = new
TreeMap<String,String[]>(req.getParameterMap());
+ TreeMap<String,String[]> parameters =
+ new TreeMap<>(req.getParameterMap());
boolean first = true;
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestResponse.java Tue Aug
28 19:38:48 2012
@@ -60,7 +60,7 @@ public class TestResponse extends Tomcat
tomcat.start();
- Map<String,List<String>> headers = new HashMap<String,List<String>>();
+ Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() + "/", new ByteChunk(),
headers);
// Check for headers without a name
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java Tue Aug
28 19:38:48 2012
@@ -68,7 +68,7 @@ public class TestSendFile extends Tomcat
tomcat.start();
ByteChunk bc = new ByteChunk();
- Map<String, List<String>> respHeaders = new HashMap<String,
List<String>>();
+ Map<String, List<String>> respHeaders = new HashMap<>();
for (int i=0; i<ITERATIONS; i++) {
long start = System.currentTimeMillis();
int rc = getUrl("http://localhost:"; + getPort() + "/servlet" +
i, bc, null, respHeaders);
Modified:
tomcat/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java
Tue Aug 28 19:38:48 2012
@@ -45,8 +45,7 @@ public class TestSecurityConstraint {
ServletSecurityElement element;
SecurityConstraint[] result;
- Set<HttpMethodConstraintElement> hmces =
- new HashSet<HttpMethodConstraintElement>();
+ Set<HttpMethodConstraintElement> hmces = new HashSet<>();
// Example 13-1
// @ServletSecurity
Modified: tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java Tue
Aug 28 19:38:48 2012
@@ -58,7 +58,7 @@ public class TestWebXmlOrdering {
e.setName("e");
f = new WebXml();
f.setName("f");
- fragments = new HashMap<String,WebXml>();
+ fragments = new HashMap<>();
fragments.put("a",a);
fragments.put("b",b);
fragments.put("c",c);
@@ -105,7 +105,7 @@ public class TestWebXmlOrdering {
app.addAbsoluteOrdering("b");
app.addAbsoluteOrdering("d");
- Set<WebXml> others = new HashSet<WebXml>();
+ Set<WebXml> others = new HashSet<>();
others.add(a);
others.add(c);
others.add(e);
@@ -130,7 +130,7 @@ public class TestWebXmlOrdering {
app.addAbsoluteOrdering(WebXml.ORDER_OTHERS);
app.addAbsoluteOrdering("d");
- Set<WebXml> others = new HashSet<WebXml>();
+ Set<WebXml> others = new HashSet<>();
others.add(a);
others.add(c);
others.add(e);
@@ -165,7 +165,7 @@ public class TestWebXmlOrdering {
app.addAbsoluteOrdering("d");
app.addAbsoluteOrdering(WebXml.ORDER_OTHERS);
- Set<WebXml> others = new HashSet<WebXml>();
+ Set<WebXml> others = new HashSet<>();
others.add(a);
others.add(c);
others.add(e);
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java Tue
Aug 28 19:38:48 2012
@@ -115,7 +115,7 @@ public class TestAddCharSetFilter extend
tomcat.start();
- Map<String, List<String>> headers = new HashMap<String,
List<String>>();
+ Map<String, List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() + "/", new ByteChunk(),
headers);
List<String> ctHeaders = headers.get("Content-Type");
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
Tue Aug 28 19:38:48 2012
@@ -68,7 +68,7 @@ public class TestCsrfPreventionFilter ex
@Test
public void testLruCacheSerializable() throws Exception {
- LruCache<String> cache = new LruCache<String>(5);
+ LruCache<String> cache = new LruCache<>(5);
cache.add("key1");
cache.add("key2");
cache.add("key3");
@@ -83,7 +83,6 @@ public class TestCsrfPreventionFilter ex
ByteArrayInputStream bais =
new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
- @SuppressWarnings("unchecked")
LruCache<String> cache2 = (LruCache<String>) ois.readObject();
cache2.add("key7");
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java
Tue Aug 28 19:38:48 2012
@@ -36,7 +36,7 @@ public class TestCsrfPreventionFilter2 {
assertTrue(threadCount > 1);
- LruCache<String> cache = new LruCache<String>(threadCount - 1);
+ LruCache<String> cache = new LruCache<>(threadCount - 1);
LruTestThread[] threads = new LruTestThread[threadCount];
for (int i = 0; i < threadCount; i++) {
Modified: tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java Tue
Aug 28 19:38:48 2012
@@ -142,7 +142,7 @@ public class TestRemoteIpFilter extends
@Test
public void testCommaDelimitedListToStringArrayEmptyList() {
- List<String> elements = new ArrayList<String>();
+ List<String> elements = new ArrayList<>();
String actual = RemoteIpFilter.listToCommaDelimitedString(elements);
assertEquals("", actual);
}
@@ -510,7 +510,7 @@ public class TestRemoteIpFilter extends
public void testWithTomcatServer() throws Exception {
// mostly default configuration : enable "x-forwarded-proto"
- Map<String, String> remoteIpFilterParameter = new HashMap<String,
String>();
+ Map<String, String> remoteIpFilterParameter = new HashMap<>();
remoteIpFilterParameter.put("protocolHeader", "x-forwarded-proto");
// SETUP
Modified:
tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
Tue Aug 28 19:38:48 2012
@@ -55,7 +55,7 @@ public class TestSerializablePrincipal
}
// Create the Principal to serialize
- List<String> roles = new ArrayList<String>();
+ List<String> roles = new ArrayList<>();
roles.add("RoleA");
roles.add("RoleB");
TesterPrincipal tpOriginal = new TesterPrincipal("inner");
Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Tue
Aug 28 19:38:48 2012
@@ -148,7 +148,7 @@ public class TestVirtualContext extends
// check that there's no duplicate in the URLs
String[] allUrlsArray = allUrls.split("\\s+");
- Assert.assertEquals(new
HashSet<String>(Arrays.asList(allUrlsArray)).size(),
+ Assert.assertEquals(new HashSet<>(Arrays.asList(allUrlsArray)).size(),
allUrlsArray.length);
String allRsrsc2ClasspathUrls =
@@ -210,7 +210,7 @@ public class TestVirtualContext extends
// check that there's no duplicate in the URLs
String[] allRsrcPathsArray = allRsrcPaths.split("\\s+");
- Assert.assertEquals(new
HashSet<String>(Arrays.asList(allRsrcPathsArray)).size(),
+ Assert.assertEquals(new
HashSet<>(Arrays.asList(allRsrcPathsArray)).size(),
allRsrcPathsArray.length);
String allRsrc2Paths =
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Tue Aug
28 19:38:48 2012
@@ -156,7 +156,7 @@ public class TestRegistration extends To
// Verify there are the correct Tomcat MBeans
onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null);
- ArrayList<String> found = new ArrayList<String>(onames.size());
+ ArrayList<String> found = new ArrayList<>(onames.size());
for (ObjectName on: onames) {
found.add(on.toString());
}
@@ -172,14 +172,14 @@ public class TestRegistration extends To
protocol = "bio";
}
String index =
getTomcatInstance().getConnector().getProperty("nameIndex").toString();
- ArrayList<String> expected = new
ArrayList<String>(Arrays.asList(basicMBeanNames()));
+ ArrayList<String> expected = new
ArrayList<>(Arrays.asList(basicMBeanNames()));
expected.addAll(Arrays.asList(hostMBeanNames("localhost")));
expected.addAll(Arrays.asList(contextMBeanNames("localhost",
contextName)));
expected.addAll(Arrays.asList(connectorMBeanNames("auto-" + index,
protocol)));
expected.addAll(Arrays.asList(optionalMBeanNames("localhost")));
// Did we find all expected MBeans?
- ArrayList<String> missing = new ArrayList<String>(expected);
+ ArrayList<String> missing = new ArrayList<>(expected);
missing.removeAll(found);
assertTrue("Missing Tomcat MBeans: " + missing, missing.isEmpty());
Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Tue Aug 28 19:38:48 2012
@@ -77,7 +77,7 @@ public class TestNonBlockingAPI extends
tomcat.start();
- Map<String, List<String>> resHeaders = new HashMap<String,
List<String>>();
+ Map<String, List<String>> resHeaders = new HashMap<>();
int rc = postUrl(true, new DataWriter(500), "http://localhost:"; +
getPort() + "/", new ByteChunk(),
resHeaders, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
@@ -100,7 +100,7 @@ public class TestNonBlockingAPI extends
System.out.println(tomcat.getConnector().getProperty("address"));
tomcat.start();
- Map<String, List<String>> resHeaders = new HashMap<String,
List<String>>();
+ Map<String, List<String>> resHeaders = new HashMap<>();
ByteChunk slowReader = new ByteChunk();
slowReader.setLimit(1); // FIXME BUFFER IS BROKEN, 0 doesn't work
slowReader.setByteOutputChannel(new ByteOutputChannel() {
@@ -154,7 +154,7 @@ public class TestNonBlockingAPI extends
System.out.println(tomcat.getConnector().getProperty("address"));
tomcat.start();
- Map<String, List<String>> resHeaders = new HashMap<String,
List<String>>();
+ Map<String, List<String>> resHeaders = new HashMap<>();
ByteChunk slowReader = new ByteChunk();
slowReader.setLimit(1); // FIXME BUFFER IS BROKEN, 0 doesn't work
slowReader.setByteOutputChannel(new ByteOutputChannel() {
Modified: tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java Tue Aug
28 19:38:48 2012
@@ -47,7 +47,7 @@ public abstract class LoggingBaseTest {
private File tempDir;
- private List<File> deleteOnTearDown = new ArrayList<File>();
+ private List<File> deleteOnTearDown = new ArrayList<>();
/**
* Helper method that returns the directory where Tomcat build resides. It
Modified: tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Tue Aug
28 19:38:48 2012
@@ -66,7 +66,7 @@ public abstract class SimpleHttpClient {
private int requestPause = 1000;
private String responseLine;
- private List<String> responseHeaders = new ArrayList<String>();
+ private List<String> responseHeaders = new ArrayList<>();
private String responseBody;
private boolean useContentLength;
@@ -229,7 +229,7 @@ public abstract class SimpleHttpClient {
useContinue = false;
responseLine = null;
- responseHeaders = new ArrayList<String>();
+ responseHeaders = new ArrayList<>();
responseBody = null;
}
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Tue Aug 28
19:38:48 2012
@@ -193,9 +193,8 @@ public class TestTomcat extends TomcatBa
* passwords.
*/
public static final class MapRealm extends RealmBase {
- private Map<String,String> users = new HashMap<String,String>();
- private Map<String,List<String>> roles =
- new HashMap<String,List<String>>();
+ private Map<String,String> users = new HashMap<>();
+ private Map<String,List<String>> roles = new HashMap<>();
public void addUser(String username, String password) {
users.put(username, password);
@@ -204,7 +203,7 @@ public class TestTomcat extends TomcatBa
public void addUserRole(String username, String role) {
List<String> userRoles = roles.get(username);
if (userRoles == null) {
- userRoles = new ArrayList<String>();
+ userRoles = new ArrayList<>();
roles.put(username, userRoles);
}
userRoles.add(role);
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java Tue
Aug 28 19:38:48 2012
@@ -100,7 +100,7 @@ public class ChannelCreator {
boolean frag = false;
int fragsize = 1024;
int autoBind = 10;
- ArrayList<Member> staticMembers = new ArrayList<Member>();
+ ArrayList<Member> staticMembers = new ArrayList<>();
Properties transportProperties = new Properties();
String transport =
"org.apache.catalina.tribes.transport.nio.PooledParallelSender";
String receiver =
"org.apache.catalina.tribes.transport.nio.NioReceiver";
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Tue Aug 28 19:38:48 2012
@@ -199,8 +199,7 @@ public final class IntrospectionUtils {
objectMethods.clear();
}
- static Hashtable<Class<?>,Method[]> objectMethods =
- new Hashtable<Class<?>,Method[]>();
+ static Hashtable<Class<?>,Method[]> objectMethods = new Hashtable<>();
public static Method[] findMethods(Class<?> c) {
Method methods[] = objectMethods.get(c);
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Tue Aug 28
19:38:48 2012
@@ -70,8 +70,7 @@ public class MapDemo implements ChannelL
*/
public MapDemo(Channel channel, String mapName ) {
//instantiate the replicated map
- map = new LazyReplicatedMap<String,StringBuilder>(null, channel, 5000,
- mapName, null);
+ map = new LazyReplicatedMap<>(null, channel, 5000, mapName, null);
//create a gui, name it with the member name of this JVM
table =
SimpleTableDemo.createAndShowGUI(map,channel.getLocalMember(false).getName());
//add ourself as a listener for messages
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Tue Aug 28 19:38:48 2012
@@ -104,7 +104,7 @@ public class TestGroupChannelMemberArriv
this.name = name;
}
- public ArrayList<Member> members = new ArrayList<Member>(1);
+ public ArrayList<Member> members = new ArrayList<>(1);
@Override
public void memberAdded(Member member) {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
Tue Aug 28 19:38:48 2012
@@ -143,13 +143,12 @@ public class TestGroupChannelSenderConne
public static class TestMsg implements Serializable {
private static final long serialVersionUID = 1L;
private static Random r = new Random();
- private HashMap<Integer, ArrayList<Object>> map =
- new HashMap<Integer, ArrayList<Object>>();
+ private HashMap<Integer, ArrayList<Object>> map = new HashMap<>();
public TestMsg() {
int size = Math.abs(r.nextInt() % 200);
for (int i=0; i<size; i++ ) {
int length = Math.abs(r.nextInt() %65000);
- ArrayList<Object> list = new ArrayList<Object>(length);
+ ArrayList<Object> list = new ArrayList<>(length);
map.put(Integer.valueOf(i),list);
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
Tue Aug 28 19:38:48 2012
@@ -99,7 +99,7 @@ public class TestDomainFilterInterceptor
this.name = name;
}
- public ArrayList<Member> members = new ArrayList<Member>();
+ public ArrayList<Member> members = new ArrayList<>();
@Override
public void memberAdded(Member member) {
if (!members.contains(member)) {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
Tue Aug 28 19:38:48 2012
@@ -101,7 +101,7 @@ public class TestOrderInterceptor {
public void testOrder2() throws Exception {
final Member[] dest = channels[0].getMembers();
final AtomicInteger value = new AtomicInteger(0);
- final Queue<Exception> exceptionQueue = new
ConcurrentLinkedQueue<Exception>();
+ final Queue<Exception> exceptionQueue = new ConcurrentLinkedQueue<>();
Runnable run = new Runnable() {
@Override
public void run() {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
Tue Aug 28 19:38:48 2012
@@ -147,7 +147,7 @@ public class TestTcpFailureDetector {
public TestMbrListener(String name) {
this.name = name;
}
- public ArrayList<Member> members = new ArrayList<Member>();
+ public ArrayList<Member> members = new ArrayList<>();
@Override
public void memberAdded(Member member) {
if ( !members.contains(member) ) {
Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Tue Aug 28
19:38:48 2012
@@ -83,7 +83,7 @@ public class Benchmarks {
}
};
- private ThreadLocal<Date> currentDateLocal = new ThreadLocal<Date>();
+ private ThreadLocal<Date> currentDateLocal = new ThreadLocal<>();
@Override
public void run() {
@@ -119,7 +119,7 @@ public class Benchmarks {
}
};
- private ThreadLocal<Date> currentDateLocal = new ThreadLocal<Date>();
+ private ThreadLocal<Date> currentDateLocal = new ThreadLocal<>();
@Override
public void run() {
@@ -266,7 +266,7 @@ public class Benchmarks {
return "ThreadLocals";
}
- private ThreadLocal<String> currentDateStringLocal = new
ThreadLocal<String>();
+ private ThreadLocal<String> currentDateStringLocal = new
ThreadLocal<>();
private ThreadLocal<Date> currentDateLocal = new ThreadLocal<Date>() {
@Override
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Tue Aug
28 19:38:48 2012
@@ -93,7 +93,7 @@ public class TestRemoteIpValve {
@Test
public void testListToCommaDelimitedStringEmptyList() {
- List<String> elements = new ArrayList<String>();
+ List<String> elements = new ArrayList<>();
String actual = RemoteIpValve.listToCommaDelimitedString(elements);
assertEquals("", actual);
}
@@ -677,9 +677,9 @@ public class TestRemoteIpValve {
}
assertNotNull(actual);
assertEquals(expected.length, actual.length);
- List<String> e = new ArrayList<String>();
+ List<String> e = new ArrayList<>();
e.addAll(Arrays.asList(expected));
- List<String> a = new ArrayList<String>();
+ List<String> a = new ArrayList<>();
a.addAll(Arrays.asList(actual));
for (String entry : e) {
Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Tue
Aug 28 19:38:48 2012
@@ -34,7 +34,7 @@ public class TesterAccessLogValve extend
// Timing tests need a small error margin to prevent failures
private static final long ERROR_MARGIN = 10;
- private final List<Entry> entries = new ArrayList<Entry>();
+ private final List<Entry> entries = new ArrayList<>();
public TesterAccessLogValve() {
// Async requests are supported
Modified: tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java Tue Aug 28
19:38:48 2012
@@ -151,7 +151,7 @@ public class TestValueExpressionImpl {
Object o1 = "String value";
Object o2 = Integer.valueOf(32);
- Map<Object,Object> map = new HashMap<Object,Object>();
+ Map<Object,Object> map = new HashMap<>();
map.put("key1", o1);
map.put("key2", o2);
@@ -178,7 +178,7 @@ public class TestValueExpressionImpl {
Object o1 = "String value";
Object o2 = Integer.valueOf(32);
- List<Object> list = new ArrayList<Object>();
+ List<Object> list = new ArrayList<>();
list.add(0, o1);
list.add(1, o2);
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Tue Aug 28
19:38:48 2012
@@ -42,7 +42,7 @@ public class TestCompiler extends Tomcat
tomcat.start();
ByteChunk res = new ByteChunk();
- Map<String,List<String>> headers = new HashMap<String,List<String>>();
+ Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49726a.jsp",
res, headers);
@@ -64,7 +64,7 @@ public class TestCompiler extends Tomcat
tomcat.start();
ByteChunk res = new ByteChunk();
- Map<String,List<String>> headers = new HashMap<String,List<String>>();
+ Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49726b.jsp",
res, headers);
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Tue Aug 28
19:38:48 2012
@@ -230,7 +230,7 @@ public class TestGenerator extends Tomca
tomcat.start();
ByteChunk res = new ByteChunk();
- Map<String,List<String>> headers = new HashMap<String,List<String>>();
+ Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() + "/test/bug49nnn/bug49799.jsp",
res, headers);
Modified: tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java Tue
Aug 28 19:38:48 2012
@@ -26,7 +26,7 @@ public class TestFastRemovalDequeue {
@Test
public void testSinglePushPop() throws Exception {
- FastRemovalDequeue<Object> q = new FastRemovalDequeue<Object>(2);
+ FastRemovalDequeue<Object> q = new FastRemovalDequeue<>(2);
Object o1 = new Object();
@@ -42,7 +42,7 @@ public class TestFastRemovalDequeue {
@Test
public void testDoublePushPop() throws Exception {
- FastRemovalDequeue<Object> q = new FastRemovalDequeue<Object>(2);
+ FastRemovalDequeue<Object> q = new FastRemovalDequeue<>(2);
Object o1 = new Object();
Object o2 = new Object();
@@ -69,7 +69,7 @@ public class TestFastRemovalDequeue {
@Test
public void testSingleUnpopPop() throws Exception {
- FastRemovalDequeue<Object> q = new FastRemovalDequeue<Object>(2);
+ FastRemovalDequeue<Object> q = new FastRemovalDequeue<>(2);
Object o1 = new Object();
@@ -85,7 +85,7 @@ public class TestFastRemovalDequeue {
@Test
public void testDoubleUnpopPop() throws Exception {
- FastRemovalDequeue<Object> q = new FastRemovalDequeue<Object>(2);
+ FastRemovalDequeue<Object> q = new FastRemovalDequeue<>(2);
Object o1 = new Object();
Object o2 = new Object();
@@ -112,7 +112,7 @@ public class TestFastRemovalDequeue {
@Test
public void testSinglePushUnpush() throws Exception {
- FastRemovalDequeue<Object> q = new FastRemovalDequeue<Object>(2);
+ FastRemovalDequeue<Object> q = new FastRemovalDequeue<>(2);
Object o1 = new Object();
@@ -128,7 +128,7 @@ public class TestFastRemovalDequeue {
@Test
public void testDoublePushUnpush() throws Exception {
- FastRemovalDequeue<Object> q = new FastRemovalDequeue<Object>(2);
+ FastRemovalDequeue<Object> q = new FastRemovalDequeue<>(2);
Object o1 = new Object();
Object o2 = new Object();
@@ -155,7 +155,7 @@ public class TestFastRemovalDequeue {
@Test
public void testSinglePushRemove() throws Exception {
- FastRemovalDequeue<Object> q = new FastRemovalDequeue<Object>(2);
+ FastRemovalDequeue<Object> q = new FastRemovalDequeue<>(2);
Object o1 = new Object();
@@ -172,7 +172,7 @@ public class TestFastRemovalDequeue {
@Test
public void testDoublePushRemove() throws Exception {
- FastRemovalDequeue<Object> q = new FastRemovalDequeue<Object>(2);
+ FastRemovalDequeue<Object> q = new FastRemovalDequeue<>(2);
Object o1 = new Object();
Object o2 = new Object();
Modified:
tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterLeakingServlet1.java Tue
Aug 28 19:38:48 2012
@@ -27,7 +27,7 @@ public class TesterLeakingServlet1 exten
private static final long serialVersionUID = 1L;
- private ThreadLocal<TesterCounter> myThreadLocal = new
ThreadLocal<TesterCounter>();
+ private ThreadLocal<TesterCounter> myThreadLocal = new ThreadLocal<>();
@Override
protected void doGet(HttpServletRequest request,
Modified:
tomcat/trunk/test/org/apache/tomcat/unittest/TesterThreadScopedHolder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterThreadScopedHolder.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterThreadScopedHolder.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterThreadScopedHolder.java
Tue Aug 28 19:38:48 2012
@@ -20,7 +20,7 @@ import java.util.List;
public class TesterThreadScopedHolder {
private static final ThreadLocal<List<TesterCounter>> threadLocal =
- new ThreadLocal<List<TesterCounter>>();
+ new ThreadLocal<>();
public static void saveInHolder(List<TesterCounter> o) {
threadLocal.set(o);
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java Tue Aug 28
19:38:48 2012
@@ -51,7 +51,7 @@ public class TestBug49158 extends Cookie
Tomcat tomcat = getTomcatInstance();
addServlets(tomcat);
tomcat.start();
- Map<String,List<String>> headers = new HashMap<String,List<String>>();
+ Map<String,List<String>> headers = new HashMap<>();
ByteChunk res = new ByteChunk();
getUrl("http://localhost:"; + getPort() + "/"+path, res, headers);
List<String> cookieHeaders = headers.get("Set-Cookie");
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
Tue Aug 28 19:38:48 2012
@@ -60,7 +60,7 @@ public class TestCookiesDefaultSysProps
assertEquals("Cookie name ok", res.toString());
// Need to read response headers to test version switching
- Map<String,List<String>> headers = new HashMap<String,List<String>>();
+ Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() + "/switch", res, headers);
List<String> cookieHeaders = headers.get("Set-Cookie");
for (String cookieHeader : cookieHeaders) {
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
Tue Aug 28 19:38:48 2012
@@ -63,7 +63,7 @@ public class TestCookiesStrictSysProps e
assertEquals("Cookie name ok", res.toString());
// Need to read response headers to test version switching
- Map<String,List<String>> headers = new HashMap<String,List<String>>();
+ Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() + "/switch", res, headers);
List<String> cookieHeaders = headers.get("Set-Cookie");
for (String cookieHeader : cookieHeaders) {
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1378281&r1=1378280&r2=1378281&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Tue Aug 28
19:38:48 2012
@@ -108,7 +108,7 @@ public class TestCustomSsl extends Tomca
// Override the defaults
ProtocolHandler handler = tomcat.getConnector().getProtocolHandler();
if (handler instanceof AbstractHttp11JsseProtocol) {
- ((AbstractHttp11JsseProtocol) handler).setTruststoreFile(null);
+ ((AbstractHttp11JsseProtocol<?>) handler).setTruststoreFile(null);
} else {
// Unexpected
fail("Unexpected handler type");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
