[patch] 2012-06-05_tc6_53050_ManagerBase.patch

2012-06-05_tc6_53050_ManagerBase.patch (text/plain), 1.36 KB, created by Konstantin Kolinko on 2012-06-05 20:42:41 UTC

(hide)

Description: 2012-06-05_tc6_53050_ManagerBase.patch

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2012-06-05 20:42:41 UTC

Size: 1.36 KB

patch

obsolete

>Index: java/org/apache/catalina/session/ManagerBase.java >=================================================================== >--- java/org/apache/catalina/session/ManagerBase.java (revision 1346371) >+++ java/org/apache/catalina/session/ManagerBase.java (working copy) >@@ -25,6 +25,7 @@ > import java.io.File; > import java.io.FileInputStream; > import java.io.IOException; >+import java.io.UnsupportedEncodingException; > import java.lang.reflect.Method; > import java.security.AccessController; > import java.security.MessageDigest; >@@ -416,7 +417,12 @@ > // Ignore > } > if (apr) { >- setEntropy(new String(result)); >+ try { >+ setEntropy(new String(result, "ISO-8859-1")); >+ } catch (UnsupportedEncodingException ux) { >+ // ISO-8859-1 should always be supported >+ throw new Error(ux); >+ } > } else { > setEntropy(this.toString()); > } >@@ -580,7 +586,7 @@ > long t1 = seed; > char entropy[] = getEntropy().toCharArray(); > for (int i = 0; i < entropy.length; i++) { >- long update = ((byte) entropy[i]) << ((i % 8) * 8); >+ long update = ((long) entropy[i]) << ((i % 8) * 8); > seed ^= update; > } > try { View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]