View | Details | Raw Unified | Return to bug 62175
Collapse All | Expand All

(-)a/java/org/apache/catalina/session/PersistentManagerBase.java (-13 / +17 lines)
Lines 707-724 public abstract class PersistentManagerBase extends ManagerBase Link Here
707
            session = sessions.get(id);
707
            session = sessions.get(id);
708
708
709
            if (session == null) {
709
            if (session == null) {
710
                try {
710
                session = loadSessionFromStore(id);
711
                    if (SecurityUtil.isPackageProtectionEnabled()){
712
                        session = securedStoreLoad(id);
713
                    } else {
714
                         session = store.load(id);
715
                    }
716
                } catch (ClassNotFoundException e) {
717
                    String msg = sm.getString(
718
                            "persistentManager.deserializeError", id);
719
                    log.error(msg, e);
720
                    throw new IllegalStateException(msg, e);
721
                }
722
711
723
                if (session != null && !session.isValid()) {
712
                if (session != null && !session.isValid()) {
724
                    log.error(sm.getString(
713
                    log.error(sm.getString(
Lines 756-761 public abstract class PersistentManagerBase extends ManagerBase Link Here
756
    }
745
    }
757
746
758
747
748
    private Session loadSessionFromStore(String id) throws IOException {
749
        try {
750
            if (SecurityUtil.isPackageProtectionEnabled()){
751
                return securedStoreLoad(id);
752
            } else {
753
                 return store.load(id);
754
            }
755
        } catch (ClassNotFoundException e) {
756
            String msg = sm.getString(
757
                    "persistentManager.deserializeError", id);
758
            log.error(msg, e);
759
            throw new IllegalStateException(msg, e);
760
        }
761
    }
762
763
759
    private Session securedStoreLoad(String id) throws IOException, ClassNotFoundException {
764
    private Session securedStoreLoad(String id) throws IOException, ClassNotFoundException {
760
        try {
765
        try {
761
            return AccessController.doPrivileged(
766
            return AccessController.doPrivileged(
762
- 

Return to bug 62175