Author: markt Date: Fri Dec 18 17:34:43 2009 New Revision: 892321 URL: http://svn.apache.org/viewvc?rev=892321&view=rev Log: Fix some Eclipse warnings in the tests
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java tomcat/trunk/test/org/apache/catalina/startup/TestWebXml.java Modified: tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=892321&r1=892320&r2=892321&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java (original) +++ tomcat/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java Fri Dec 18 17:34:43 2009 @@ -46,7 +46,7 @@ private boolean init; - private synchronized void init() throws Exception { + private synchronized void init() { if (init) return; Tomcat tomcat = getTomcatInstance(); 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=892321&r1=892320&r2=892321&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original) +++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Fri Dec 18 17:34:43 2009 @@ -44,7 +44,7 @@ * any of the {...@link HttpServletRequest} getParameterXXX() methods if the * request is chunked. */ - public void testBug37794() throws Exception { + public void testBug37794() { Bug37794Client client = new Bug37794Client(); client.setPort(getPort()); 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=892321&r1=892320&r2=892321&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java (original) +++ tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java Fri Dec 18 17:34:43 2009 @@ -36,6 +36,7 @@ /** * Simple serialization / de-serialization test for bug 43840. */ + @SuppressWarnings("null") public void testWriteReadPrincipal() { // Get a temporary file to use for the serialization test File file = null; Modified: tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java?rev=892321&r1=892320&r2=892321&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java (original) +++ tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java Fri Dec 18 17:34:43 2009 @@ -22,6 +22,8 @@ public class TesterPrincipal implements Principal, Serializable { + private static final long serialVersionUID = 1L; + private String name; public TesterPrincipal(String theName) { Modified: tomcat/trunk/test/org/apache/catalina/startup/TestWebXml.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestWebXml.java?rev=892321&r1=892320&r2=892321&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestWebXml.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestWebXml.java Fri Dec 18 17:34:43 2009 @@ -232,14 +232,14 @@ a.addBeforeOrder("b"); b.addBeforeOrder("a"); - Exception e = null; + Exception exception = null; try { WebXml.orderWebFragments(app, fragments); } catch (Exception e1) { - e = e1; + exception = e1; } - assertTrue(e instanceof IllegalArgumentException); + assertTrue(exception instanceof IllegalArgumentException); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org