Author: markt
Date: Mon Jan 4 10:31:54 2016
New Revision: 1722831
URL: http://svn.apache.org/viewvc?rev=1722831&view=rev
Log:
Refactor to always use the CustomObjectInputStream
Modified:
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1722831&r1=1722830&r2=1722831&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Mon Jan 4
10:31:54 2016
@@ -235,12 +235,12 @@ public final class FileStore extends Sto
if (loader != null) {
classLoader = loader.getClassLoader();
}
- if (classLoader != null) {
- Thread.currentThread().setContextClassLoader(classLoader);
- ois = new CustomObjectInputStream(bis, classLoader);
+ if (classLoader == null) {
+ classLoader = getClass().getClassLoader();
} else {
- ois = new ObjectInputStream(bis);
+ Thread.currentThread().setContextClassLoader(classLoader);
}
+ ois = new CustomObjectInputStream(bis, classLoader);
StandardSession session = (StandardSession)
manager.createEmptySession();
session.readObjectData(ois);
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1722831&r1=1722830&r2=1722831&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Mon Jan 4
10:31:54 2016
@@ -627,13 +627,12 @@ public class JDBCStore extends StoreBase
if (loader != null) {
classLoader = loader.getClassLoader();
}
- if (classLoader != null) {
-
Thread.currentThread().setContextClassLoader(classLoader);
- ois = new CustomObjectInputStream(bis,
- classLoader);
+ if (classLoader == null) {
+ classLoader = getClass().getClassLoader();
} else {
- ois = new ObjectInputStream(bis);
+
Thread.currentThread().setContextClassLoader(classLoader);
}
+ ois = new CustomObjectInputStream(bis,
classLoader);
if
(manager.getContext().getLogger().isDebugEnabled()) {
manager.getContext().getLogger().debug(sm.getString(getStoreName() + ".loading",
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1722831&r1=1722830&r2=1722831&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Mon Jan
4 10:31:54 2016
@@ -216,17 +216,10 @@ public class StandardManager extends Man
if (loader != null) {
classLoader = loader.getClassLoader();
}
- if (classLoader != null) {
- if (log.isDebugEnabled()) {
- log.debug("Creating custom object input stream for class
loader ");
- }
- ois = new CustomObjectInputStream(bis, classLoader);
- } else {
- if (log.isDebugEnabled()) {
- log.debug("Creating standard object input stream");
- }
- ois = new ObjectInputStream(bis);
+ if (classLoader == null) {
+ classLoader = getClass().getClassLoader();
}
+ ois = new CustomObjectInputStream(bis, classLoader);
} catch (FileNotFoundException e) {
if (log.isDebugEnabled()) {
log.debug("No persisted data file found");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
