Re: svn commit: r1845162 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

2018-10-29 Thread Mark Thomas 
On October 29, 2018 7:12:12 PM UTC, Christopher Schultz 
 wrote:
>-BEGIN PGP SIGNED MESSAGE-
>Hash: SHA256
>
>Mark,
>
>On 10/29/18 14:40, Mark Thomas wrote:
>> On 29/10/2018 18:40, ma...@apache.org wrote:
>>> Author: markt Date: Mon Oct 29 18:40:16 2018 New Revision:
>>> 1845162
>>> 
>>> URL: http://svn.apache.org/viewvc?rev=1845162=rev Log: Fix
>>> redundant assignment warning.
>> 
>> Chris,
>> 
>> I think this is what you intended. Can you check my change here
>> please?
>
>It was. Thanks for the catch.
>
>I would have fixed these individual issues myself; I just forgot to
>run checkstyle.

Np. The fixed were simple. There is one issue left - an illegal import as there 
is a depenendency on the o.a.tomcat package that needs to be fixed. You're 
welcome to fix that as I am now in meeting ;)

Mark

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

Re: svn commit: r1845162 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

2018-10-29 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 10/29/18 14:40, Mark Thomas wrote:
> On 29/10/2018 18:40, ma...@apache.org wrote:
>> Author: markt Date: Mon Oct 29 18:40:16 2018 New Revision:
>> 1845162
>> 
>> URL: http://svn.apache.org/viewvc?rev=1845162=rev Log: Fix
>> redundant assignment warning.
> 
> Chris,
> 
> I think this is what you intended. Can you check my change here
> please?

It was. Thanks for the catch.

I would have fixed these individual issues myself; I just forgot to
run checkstyle.

Thanks,
- -chris

> 
> Thanks,
> 
> Mark
> 
> 
>> 
>> Modified:
>> 
>> tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/Encry
ptInterceptor.java
>>
>>
>>
>> 
Modified:
>> tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/Encry
ptInterceptor.java
>>
>>
>> 
URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tr
ibes/group/interceptors/EncryptInterceptor.java?rev=1845162=1845161
2=1845162=diff
>>
>>
>> 

==
>> 
>> --- 
>> tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/Encry
ptInterceptor.java
>>
>> 
(original)
>> +++ 
>> tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/Encry
ptInterceptor.java
>>
>> 
Mon Oct 29 18:40:16 2018
>> @@ -179,10 +179,11 @@ public class EncryptInterceptor extends */ 
>> @Override public void setEncryptionKey(byte[] key) { -
>> if(null == key) -key = null; -else +
>> if (null == key) { +encryptionKeyBytes = null; +
>> } else { encryptionKeyBytes = key.clone(); +} } /**
>> 
>> 
>> 
>> -
>>
>> 
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>> 
> 
> -
>
> 
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlvXW4sACgkQHPApP6U8
pFjXSBAAhg8mA5d+lLSYw75wznLTu/zTGD2JgY5SLFEzbS0/WR//655k4atgPbnz
arRRyT/61zriB+irwdyemuBVHVpLLa/I++Hzk8cWS3n3/BhmC7BqnoG5L+o6htZD
iRVvYhYwZO99B6iJYJg9dkbprUR5CalF3qVJoJNvBYRXUE8x18QN9b5PDPyI3p3u
7xb9kMD1KKRoFmrk1jix1NodvUitLQl5O5BWReNGeLjdTeRxjHDF2yQnyacbpxXU
gKjQPk7JAOlD4HM9rRkmW9lwLwGxkeAW78LdH1iPxt3ewHLWi9XhF3lV7zY6Aic5
DIucuIpRzNsValTz+nQa/WqE+aPNlNA+UJ1CL/O6UGUFknXVZG4pBuAG1Bk8Fnze
U7ruy2r3KfijJfmPhPddZRiEXUIEKhpWqhKilk1wFNeT6xUsItYyQ3GRmm1a8utD
CsUymj/JFrlxy6tU6PwA+XiYR7E/6Wx/IeYuGuRbL/ndSxfals9CB0Ug8+X9/WqD
LMG26sAjmZTPwXCkdb2YqV6ycdiv1FRtUXqKvr9ddg1WchvS1mKXroIqSB8vChND
qkRodgocBF6YatS0e2W0RJKXJlGkTLbERyi3OPXM+y9CAW1UAc7P79+4onxj5ijJ
zc+F9V6gM692N/9OF5LR+hxZbpJN2Qsx0zDDpQkgwo2KUGCMJkE=
=nco/
-END PGP SIGNATURE-

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

Re: svn commit: r1845162 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

2018-10-29 Thread Mark Thomas 

On 29/10/2018 18:40, ma...@apache.org wrote:

Author: markt
Date: Mon Oct 29 18:40:16 2018
New Revision: 1845162

URL: http://svn.apache.org/viewvc?rev=1845162=rev
Log:
Fix redundant assignment warning.


Chris,

I think this is what you intended. Can you check my change here please?

Thanks,

Mark




Modified:
 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java?rev=1845162=1845161=1845162=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 Mon Oct 29 18:40:16 2018
@@ -179,10 +179,11 @@ public class EncryptInterceptor extends
   */
  @Override
  public void setEncryptionKey(byte[] key) {
-if(null == key)
-key = null;
-else
+if (null == key) {
+encryptionKeyBytes = null;
+} else {
  encryptionKeyBytes = key.clone();
+}
  }
  
  /**




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



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

svn commit: r1845162 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

2018-10-29 Thread markt 
Author: markt
Date: Mon Oct 29 18:40:16 2018
New Revision: 1845162

URL: http://svn.apache.org/viewvc?rev=1845162=rev
Log:
Fix redundant assignment warning.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java?rev=1845162=1845161=1845162=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 Mon Oct 29 18:40:16 2018
@@ -179,10 +179,11 @@ public class EncryptInterceptor extends
  */
 @Override
 public void setEncryptionKey(byte[] key) {
-if(null == key)
-key = null;
-else
+if (null == key) {
+encryptionKeyBytes = null;
+} else {
 encryptionKeyBytes = key.clone();
+}
 }
 
 /**



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