Author: markt
Date: Mon Aug 21 09:44:16 2017
New Revision: 1805612
URL: http://svn.apache.org/viewvc?rev=1805612&view=rev
Log:
Fix IDE nags
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java?rev=1805612&r1=1805611&r2=1805612&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java Mon
Aug 21 09:44:16 2017
@@ -29,7 +29,7 @@ public class OpenSSLConf {
private static final Log log = LogFactory.getLog(OpenSSLConf.class);
private static final StringManager sm =
StringManager.getManager(OpenSSLConf.class);
- private final List<OpenSSLConfCmd> commands = new
ArrayList<OpenSSLConfCmd>();
+ private final List<OpenSSLConfCmd> commands = new ArrayList<>();
public void addCmd(OpenSSLConfCmd cmd) {
commands.add(cmd);
@@ -65,10 +65,12 @@ public class OpenSSLConf {
return false;
}
if (rc <= 0) {
- log.error(sm.getString("opensslconf.failedCommand", name,
value, rc));
+ log.error(sm.getString("opensslconf.failedCommand", name,
value,
+ Integer.toString(rc)));
result = false;
} else if (log.isDebugEnabled()) {
- log.debug(sm.getString("opensslconf.resultCommand", name,
value, rc));
+ log.debug(sm.getString("opensslconf.resultCommand", name,
value,
+ Integer.toString(rc)));
}
}
if (!result) {
@@ -110,10 +112,12 @@ public class OpenSSLConf {
return false;
}
if (rc <= 0) {
- log.error(sm.getString("opensslconf.failedCommand", name,
value, rc));
+ log.error(sm.getString("opensslconf.failedCommand", name,
value,
+ Integer.toString(rc)));
result = false;
} else if (log.isDebugEnabled()) {
- log.debug(sm.getString("opensslconf.resultCommand", name,
value, rc));
+ log.debug(sm.getString("opensslconf.resultCommand", name,
value,
+ Integer.toString(rc)));
}
}
try {
@@ -124,7 +128,7 @@ public class OpenSSLConf {
return false;
}
if (rc <= 0) {
- log.error(sm.getString("opensslconf.finishFailed", rc));
+ log.error(sm.getString("opensslconf.finishFailed",
Integer.toString(rc)));
result = false;
}
if (!result) {
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1805612&r1=1805611&r2=1805612&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon Aug 21
09:44:16 2017
@@ -253,8 +253,8 @@ public final class TesterSupport {
return clientAuthExpectedIssuer;
}
- protected static void trackTrackingKeyManagers(KeyManager wrapper,
KeyManager wrapped,
- String usage, Principal[]
issuers) {
+ protected static void trackTrackingKeyManagers(@SuppressWarnings("unused")
KeyManager wrapper,
+ @SuppressWarnings("unused") KeyManager wrapped, String usage,
Principal[] issuers) {
lastUsage = usage;
lastRequestedIssuers = issuers;
}
@@ -268,7 +268,7 @@ public final class TesterSupport {
}
protected static Principal getLastClientAuthRequestedIssuer(int index) {
- return lastRequestedIssuers[0];
+ return lastRequestedIssuers[index];
}
protected static boolean checkLastClientAuthRequestedIssuers() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
