Author: remm
Date: Thu Jul 27 15:55:47 2017
New Revision: 1803205
URL: http://svn.apache.org/viewvc?rev=1803205&view=rev
Log:
Fix findbugs warnings.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1803205&r1=1803204&r2=1803205&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Jul 27
15:55:47 2017
@@ -295,7 +295,7 @@ public class Digester extends DefaultHan
* The Log to which most logging calls will be made.
*/
protected Log log = LogFactory.getLog(Digester.class);
- protected static StringManager sm =
StringManager.getManager(Digester.class);
+ protected static final StringManager sm =
StringManager.getManager(Digester.class);
/**
* The Log to which all SAX event related logging calls will be made.
@@ -322,7 +322,7 @@ public class Digester extends DefaultHan
if (value != null) {
try {
String newValue =
IntrospectionUtils.replaceProperties(value, null, propertySources);
- if (value != newValue) {
+ if (!value.equals(newValue)) {
System.setProperty(name, newValue);
}
} catch (Exception e) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=1803205&r1=1803204&r2=1803205&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Thu
Jul 27 15:55:47 2017
@@ -450,7 +450,6 @@ public class NioBlockingSelector {
log.warn("Possible key leak, cancelling key in the
finalizer.");
try {key.cancel();}catch (Exception ignore){}
}
- key = null;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
