Author: markt
Date: Thu Nov 12 21:29:46 2015
New Revision: 1714123
URL: http://svn.apache.org/viewvc?rev=1714123&view=rev
Log:
Fix some IDE warnings
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1714123&r1=1714122&r2=1714123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Nov 12
21:29:46 2015
@@ -1856,7 +1856,7 @@ public class Request implements HttpServ
try {
// Do not go through the instance manager for internal Tomcat
classes since they don't need injection
if
(InternalHttpUpgradeHandler.class.isAssignableFrom(httpUpgradeHandlerClass)) {
- handler = (T) httpUpgradeHandlerClass.newInstance();
+ handler = httpUpgradeHandlerClass.newInstance();
} else {
instanceManager = getContext().getInstanceManager();
handler = (T)
instanceManager.newInstance(httpUpgradeHandlerClass);
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1714123&r1=1714122&r2=1714123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Nov
12 21:29:46 2015
@@ -981,6 +981,7 @@ public class DeltaManager extends Cluste
* whether this method has been called during session expiration
* @return a SessionMessage to be sent,
*/
+ @SuppressWarnings("null") // session can't be null when it is used
public ClusterMessage requestCompleted(String sessionId, boolean expires) {
DeltaSession session = null;
SessionMessage msg = null;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1714123&r1=1714122&r2=1714123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Nov 12
21:29:46 2015
@@ -1165,9 +1165,7 @@ public class Nio2Endpoint extends Abstra
} catch (InterruptedException e) {
throw new IOException(e);
} catch (TimeoutException e) {
- if (integer != null) {
- integer.cancel(true);
- }
+ integer.cancel(true);
throw new SocketTimeoutException();
}
} else {
@@ -1244,9 +1242,7 @@ public class Nio2Endpoint extends Abstra
} catch (InterruptedException e) {
throw new IOException(e);
} catch (TimeoutException e) {
- if (integer != null) {
- integer.cancel(true);
- }
+ integer.cancel(true);
throw new SocketTimeoutException();
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java?rev=1714123&r1=1714122&r2=1714123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java
Thu Nov 12 21:29:46 2015
@@ -20,12 +20,8 @@ import java.io.File;
import javax.net.ssl.KeyManager;
-import org.apache.tomcat.util.res.StringManager;
-
public class OpenSSLKeyManager implements KeyManager{
- private static final StringManager sm =
StringManager.getManager(OpenSSLKeyManager.class);
-
private File certificateChain;
public File getCertificateChain() { return certificateChain; }
public void setCertificateChain(File certificateChain) {
this.certificateChain = certificateChain; }
@@ -44,5 +40,4 @@ public class OpenSSLKeyManager implement
this.certificateChain = new File(certChainFile);
this.privateKey = new File(keyFile);
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
