You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/09/04 11:55:32 UTC

svn commit: r1807213 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Author: markt
Date: Mon Sep  4 11:55:32 2017
New Revision: 1807213

URL: http://svn.apache.org/viewvc?rev=1807213&view=rev
Log:
Fix some IDE nags

Modified:
    tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1807213&r1=1807212&r2=1807213&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon Sep  4 11:55:32 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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1807213 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Posted by Mark Thomas <ma...@apache.org>.
On 04/09/17 13:17, Rainer Jung wrote:
> Sorry, forgot to backport those fixes you already applied to trunk. I
> was only looking for my commits and forgot your fixes.

No problem.

> I will add the backports that depend on 1.2.14 (checking successful
> client cert handshake and new OpenSSLConfCmd feature) this evening or
> tomorrow (and hope to find some time for docs and tests).

Sounds great.

Mark


> 
> Thanks!
> 
> Rainer
> 
> Am 04.09.2017 um 13:55 schrieb markt@apache.org:
>> Author: markt
>> Date: Mon Sep  4 11:55:32 2017
>> New Revision: 1807213
>>
>> URL: http://svn.apache.org/viewvc?rev=1807213&view=rev
>> Log:
>> Fix some IDE nags
>>
>> Modified:
>>    
>> tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
>>
>> Modified:
>> tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1807213&r1=1807212&r2=1807213&view=diff
>>
>> ==============================================================================
>>
>> ---
>> tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
>>
>> +++
>> tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon
>> Sep  4 11:55:32 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: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1807213 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Posted by Rainer Jung <ra...@kippdata.de>.
Sorry, forgot to backport those fixes you already applied to trunk. I 
was only looking for my commits and forgot your fixes.

I will add the backports that depend on 1.2.14 (checking successful 
client cert handshake and new OpenSSLConfCmd feature) this evening or 
tomorrow (and hope to find some time for docs and tests).

Thanks!

Rainer

Am 04.09.2017 um 13:55 schrieb markt@apache.org:
> Author: markt
> Date: Mon Sep  4 11:55:32 2017
> New Revision: 1807213
>
> URL: http://svn.apache.org/viewvc?rev=1807213&view=rev
> Log:
> Fix some IDE nags
>
> Modified:
>     tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
>
> Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
> URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1807213&r1=1807212&r2=1807213&view=diff
> ==============================================================================
> --- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
> +++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Mon Sep  4 11:55:32 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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org