502322010-11-08 05:09:39 +0000org.apache.catalina.session.StoreBase has a hidden dependency on PersistentManager2010-11-09 10:32:48 +0000111UnclassifiedTomcat 7CatalinatrunkPCLinuxRESOLVEDFIXEDP2minor---1tsbatistadev0oldest_to_newest141536026270tsbatista2010-11-08 05:09:39 +0000Created attachment 26270
Removes hidden dependency on PersistentStore
StoreBase.java depends explicitly on the Manager interface, however, it later casts the manager object to the PersistentManager class with out any check.
This removes that dependency, therefore allowing the usage of this store with any manager that does not extend PersistentManager.
I will later attach a path that removes the offending isLoaded() method as that may induce the same problem further along...141537126271tsbatista2010-11-08 05:19:24 +0000Created attachment 26271
Removes the isLoaded method from PersistentManagerBase
This patch removes the isLoaded method that was previously called only by StoreBase. This is optional, but as that particular path of code is no longer used, it seemed like the right thing to do.1415682markt2010-11-09 10:32:48 +0000Thanks for the patches. Fixed in trunk (with a slight modification) and will be included in 7.0.5 onwards.262702010-11-08 05:09:39 +00002010-11-08 05:09:39 +0000Removes hidden dependency on PersistentStoreStoreBase.patchapplication/octet-stream1234tsbatistaSW5kZXg6IGphdmEvb3JnL2FwYWNoZS9jYXRhbGluYS9zZXNzaW9uL1N0b3JlQmFzZS5qYXZhCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIGphdmEvb3JnL2FwYWNoZS9jYXRhbGluYS9zZXNzaW9uL1N0b3JlQmFzZS5q
YXZhCShyZXZpc2lvbiAxMDMyNTA4KQorKysgamF2YS9vcmcvYXBhY2hlL2NhdGFsaW5hL3Nlc3Np
b24vU3RvcmVCYXNlLmphdmEJKHdvcmtpbmcgY29weSkKQEAgLTE2NywxMSArMTY3LDE1IEBACiAg
ICAgICAgICAgICAgICAgaWYgKG1hbmFnZXIuZ2V0Q29udGFpbmVyKCkuZ2V0TG9nZ2VyKCkuaXNE
ZWJ1Z0VuYWJsZWQoKSkgewogICAgICAgICAgICAgICAgICAgICBtYW5hZ2VyLmdldENvbnRhaW5l
cigpLmdldExvZ2dlcigpLmRlYnVnKGdldFN0b3JlTmFtZSgpKyAiOiBwcm9jZXNzRXhwaXJlcyBl
eHBpcmUgc3RvcmUgc2Vzc2lvbiAiICsga2V5c1tpXSApOwogICAgICAgICAgICAgICAgIH0KLSAg
ICAgICAgICAgICAgICBpZiAoICggKFBlcnNpc3RlbnRNYW5hZ2VyQmFzZSkgbWFuYWdlcikuaXNM
b2FkZWQoIGtleXNbaV0gKSkgewotICAgICAgICAgICAgICAgICAgICAvLyByZWN5Y2xlIG9sZCBi
YWNrdXAgc2Vzc2lvbgotICAgICAgICAgICAgICAgICAgICBzZXNzaW9uLnJlY3ljbGUoKTsKLSAg
ICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICAvLyBleHBpcmUgc3dh
cHBlZCBvdXQgc2Vzc2lvbgorICAgICAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgICAg
ICAgIGlmICggbWFuYWdlci5maW5kU2Vzc2lvbigga2V5c1tpXSApICE9IG51bGwpIHsKKyAgICAg
ICAgICAgICAgICAgICAgICAgIC8vIHJlY3ljbGUgb2xkIGJhY2t1cCBzZXNzaW9uCisgICAgICAg
ICAgICAgICAgICAgICAgICBzZXNzaW9uLnJlY3ljbGUoKTsKKyAgICAgICAgICAgICAgICAgICAg
fSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIGV4cGlyZSBzd2FwcGVkIG91dCBz
ZXNzaW9uCisgICAgICAgICAgICAgICAgICAgICAgICBzZXNzaW9uLmV4cGlyZSgpOworICAgICAg
ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkg
ewogICAgICAgICAgICAgICAgICAgICBzZXNzaW9uLmV4cGlyZSgpOwogICAgICAgICAgICAgICAg
IH0KICAgICAgICAgICAgICAgICByZW1vdmUoa2V5c1tpXSk7Cg==
262712010-11-08 05:19:24 +00002010-11-08 05:19:24 +0000Removes the isLoaded method from PersistentManagerBasePersistentManagerBase.patchtext/plain920tsbatistaSW5kZXg6IGphdmEvb3JnL2FwYWNoZS9jYXRhbGluYS9zZXNzaW9uL1BlcnNpc3RlbnRNYW5hZ2Vy
QmFzZS5qYXZhCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIGphdmEvb3JnL2FwYWNoZS9jYXRhbGluYS9zZXNzaW9u
L1BlcnNpc3RlbnRNYW5hZ2VyQmFzZS5qYXZhCShyZXZpc2lvbiAxMDMyNTA4KQorKysgamF2YS9v
cmcvYXBhY2hlL2NhdGFsaW5hL3Nlc3Npb24vUGVyc2lzdGVudE1hbmFnZXJCYXNlLmphdmEJKHdv
cmtpbmcgY29weSkKQEAgLTMxMCwyMyArMzEwLDYgQEAKIAogCiAgICAgLyoqCi0gICAgICogUmV0
dXJuIHRydWUsIGlmIHRoZSBzZXNzaW9uIGlkIGlzIGxvYWRlZCBpbiBtZW1vcnkKLSAgICAgKiBv
dGhlcndpc2UgZmFsc2UgaXMgcmV0dXJuZWQKLSAgICAgKgotICAgICAqIEBwYXJhbSBpZCBUaGUg
c2Vzc2lvbiBpZCBmb3IgdGhlIHNlc3Npb24gdG8gYmUgc2VhcmNoZWQgZm9yCi0gICAgICovCi0g
ICAgcHVibGljIGJvb2xlYW4gaXNMb2FkZWQoIFN0cmluZyBpZCApewotICAgICAgICB0cnkgewot
ICAgICAgICAgICAgaWYgKCBzdXBlci5maW5kU2Vzc2lvbihpZCkgIT0gbnVsbCApCi0gICAgICAg
ICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsK
LSAgICAgICAgICAgIGxvZy5lcnJvcigiY2hlY2tpbmcgaXNMb2FkZWQgZm9yIGlkLCAiICsgaWQg
KyAiLCAiK2UuZ2V0TWVzc2FnZSgpLCBlKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gZmFs
c2U7Ci0gICAgfQotCi0KLSAgICAvKioKICAgICAgKiBSZXR1cm4gdGhlIGRlc2NyaXB0aXZlIHNo
b3J0IG5hbWUgb2YgdGhpcyBNYW5hZ2VyIGltcGxlbWVudGF0aW9uLgogICAgICAqLwogICAgIEBP
dmVycmlkZQo=