Author: markt
Date: Fri Jan 31 19:49:51 2014
New Revision: 1563229
URL: http://svn.apache.org/r1563229
Log:
Upgraded Eclipse to Kepler. Fix resulting IDE warnings
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/javax/el/TestBeanELResolver.java
tomcat/trunk/test/javax/el/TestBeanNameELResolver.java
tomcat/trunk/test/javax/el/TestStaticFieldELResolver.java
tomcat/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1563229&r1=1563228&r2=1563229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Jan 31
19:49:51 2014
@@ -1733,7 +1733,6 @@ public class ContextConfig implements Li
* Identify the application web.xml to be used and obtain an input source
* for it.
*/
- @SuppressWarnings("resource") // stream is meant to be left open here
protected InputSource getContextWebXmlSource() {
InputStream stream = null;
InputSource source = null;
@@ -1744,8 +1743,7 @@ public class ContextConfig implements Li
// Open the application web.xml file, if it exists
ServletContext servletContext = context.getServletContext();
if (servletContext != null) {
- altDDName = (String)servletContext.getAttribute(
- Globals.ALT_DD_ATTR);
+ altDDName =
(String)servletContext.getAttribute(Globals.ALT_DD_ATTR);
if (altDDName != null) {
try {
stream = new FileInputStream(altDDName);
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1563229&r1=1563228&r2=1563229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri
Jan 31 19:49:51 2014
@@ -561,6 +561,7 @@ public class WsWebSocketContainer
* @throws DeploymentException
* @throws TimeoutException
*/
+ @SuppressWarnings("null")
private HandshakeResponse processResponse(ByteBuffer response,
AsyncChannelWrapper channel, long timeout) throws
InterruptedException,
ExecutionException, DeploymentException, EOFException,
@@ -634,7 +635,6 @@ public class WsWebSocketContainer
values.add(headerValue);
}
-
private String readLine(ByteBuffer response) {
// All ISO-8859-1
StringBuilder sb = new StringBuilder();
Modified: tomcat/trunk/test/javax/el/TestBeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestBeanELResolver.java?rev=1563229&r1=1563228&r2=1563229&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestBeanELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestBeanELResolver.java Fri Jan 31 19:49:51 2014
@@ -59,7 +59,6 @@ public class TestBeanELResolver {
Assert.assertTrue("Wrong exception type",
e instanceof PropertyNotFoundException);
String type = Bean.class.getName();
- @SuppressWarnings("null") // Assert above prevents msg being null
String msg = e.getMessage();
Assert.assertTrue("No reference to type [" + type +
"] where property cannot be found in [" + msg + "]",
Modified: tomcat/trunk/test/javax/el/TestBeanNameELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestBeanNameELResolver.java?rev=1563229&r1=1563228&r2=1563229&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestBeanNameELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestBeanNameELResolver.java Fri Jan 31 19:49:51
2014
@@ -559,7 +559,6 @@ public class TestBeanNameELResolver {
Assert.assertFalse(context.isPropertyResolved());
Assert.assertNotNull(elException);
- @SuppressWarnings("null") // Can't be null due to assertion above
Throwable cause = elException.getCause();
Assert.assertNotNull(cause);
}
Modified: tomcat/trunk/test/javax/el/TestStaticFieldELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestStaticFieldELResolver.java?rev=1563229&r1=1563228&r2=1563229&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestStaticFieldELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestStaticFieldELResolver.java Fri Jan 31
19:49:51 2014
@@ -477,7 +477,6 @@ public class TestStaticFieldELResolver {
Assert.assertNotNull(exception);
if (checkCause) {
- @SuppressWarnings("null")
// Can't be null due to assertion above
Throwable cause = exception.getCause();
Assert.assertNotNull(cause);
Modified: tomcat/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java?rev=1563229&r1=1563228&r2=1563229&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java Fri
Jan 31 19:49:51 2014
@@ -482,7 +482,6 @@ public class TestExpiresFilter extends T
Assert.assertNotNull(actualMaxAgeInSeconds);
- @SuppressWarnings("null")
int deltaInSeconds = Math.abs(actualMaxAgeInSeconds.intValue() -
expectedMaxAgeInSeconds.intValue());
Assert.assertTrue("actualMaxAgeInSeconds: " +
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1563229&r1=1563228&r2=1563229&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Fri Jan 31 19:49:51 2014
@@ -917,6 +917,7 @@ public class TestHostConfigAutomaticDepl
}
if (!resultWar && !resultDir) {
if (resultXml) {
+ Assert.assertNotNull(ctxt);
Assert.assertEquals(LifecycleState.FAILED, ctxt.getState());
} else {
Assert.assertNull(ctxt);
@@ -1191,6 +1192,7 @@ public class TestHostConfigAutomaticDepl
}
if (!resultWar && !resultDir) {
if (resultXml) {
+ Assert.assertNotNull(newContext);
if (!startExternalWar && !startExternalDir) {
Assert.assertEquals(LifecycleState.FAILED,
newContext.getState());
@@ -1511,6 +1513,7 @@ public class TestHostConfigAutomaticDepl
}
if (!resultWar && !resultDir) {
if (resultXml) {
+ Assert.assertNotNull(newContext);
if (!startExternalWar && !startExternalDir) {
Assert.assertEquals(LifecycleState.FAILED,
newContext.getState());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
