Merge pull request #53 from pferraro/master

Update to WF 22.0.1.Final.
wildfly-clustering · Feb 19, 2021 · 7076471 · 7076471
2 parents c658952 + 6513d2f
commit 7076471
Show file tree

Hide file tree

Showing 23 changed files with 65 additions and 152 deletions.
diff --git a/...a/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSpecificationProvider.java b/...a/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSpecificationProvider.java
@@ -65,7 +65,7 @@ public long getCreationTime() {
 
             @Override
             public long getLastAccessedTime() {
-                return session.getMetaData().getLastAccessedTime().toEpochMilli();
+                return session.getMetaData().getLastAccessStartTime().toEpochMilli();
             }
 
             @Override

diff --git a/10.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java b/10.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java
@@ -93,7 +93,7 @@ public String getIdInternal() {
     @Override
     public long getLastAccessedTime() {
         try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
-            return this.session.getMetaData().getLastAccessedTime().toEpochMilli();
+            return this.session.getMetaData().getLastAccessStartTime().toEpochMilli();
         }
     }
 
@@ -204,7 +204,7 @@ public void tellChangedSessionId(String newId, String oldId, boolean notifySessi
                 newSession.getAttributes().setAttribute(name, oldSession.getAttributes().getAttribute(name));
             }
             newSession.getMetaData().setMaxInactiveInterval(oldSession.getMetaData().getMaxInactiveInterval());
-            newSession.getMetaData().setLastAccessedTime(oldSession.getMetaData().getLastAccessedTime());
+            newSession.getMetaData().setLastAccess(oldSession.getMetaData().getLastAccessStartTime(), oldSession.getMetaData().getLastAccessEndTime());
             newSession.getLocalContext().setAuthType(oldSession.getLocalContext().getAuthType());
             newSession.getLocalContext().setPrincipal(oldSession.getLocalContext().getPrincipal());
             this.session = newSession;

diff --git a/10.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java b/10.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java
@@ -110,7 +110,7 @@ public long getCreationTime() {
     @Override
     public long getLastAccessedTime() {
         try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
-            return this.session.getMetaData().getLastAccessedTime().toEpochMilli();
+            return this.session.getMetaData().getLastAccessStartTime().toEpochMilli();
         }
     }
 

diff --git a/10.0/pom.xml b/10.0/pom.xml
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <version.org.apache.tomcat>10.0.0</version.org.apache.tomcat>
+        <version.org.apache.tomcat>10.0.2</version.org.apache.tomcat>
     </properties>
 
     <dependencyManagement>

diff --git a/...a/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSpecificationProvider.java b/...a/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSpecificationProvider.java
@@ -65,7 +65,7 @@ public long getCreationTime() {
 
             @Override
             public long getLastAccessedTime() {
-                return session.getMetaData().getLastAccessedTime().toEpochMilli();
+                return session.getMetaData().getLastAccessStartTime().toEpochMilli();
             }
 
             @Override

diff --git a/7.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java b/7.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java
@@ -90,7 +90,7 @@ public String getIdInternal() {
     @Override
     public long getLastAccessedTime() {
         try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
-            return this.session.getMetaData().getLastAccessedTime().toEpochMilli();
+            return this.session.getMetaData().getLastAccessStartTime().toEpochMilli();
         }
     }
 
@@ -201,7 +201,7 @@ public void tellChangedSessionId(String newId, String oldId) {
                 newSession.getAttributes().setAttribute(name, oldSession.getAttributes().getAttribute(name));
             }
             newSession.getMetaData().setMaxInactiveInterval(oldSession.getMetaData().getMaxInactiveInterval());
-            newSession.getMetaData().setLastAccessedTime(oldSession.getMetaData().getLastAccessedTime());
+            newSession.getMetaData().setLastAccess(oldSession.getMetaData().getLastAccessStartTime(), oldSession.getMetaData().getLastAccessEndTime());
             newSession.getLocalContext().setAuthType(oldSession.getLocalContext().getAuthType());
             newSession.getLocalContext().setPrincipal(oldSession.getLocalContext().getPrincipal());
             this.session = newSession;

diff --git a/7.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java b/7.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java
@@ -110,7 +110,7 @@ public long getCreationTime() {
     @Override
     public long getLastAccessedTime() {
         try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
-            return this.session.getMetaData().getLastAccessedTime().toEpochMilli();
+            return this.session.getMetaData().getLastAccessStartTime().toEpochMilli();
         }
     }
 

diff --git a/7.0/pom.xml b/7.0/pom.xml
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <version.org.apache.tomcat>7.0.107</version.org.apache.tomcat>
+        <version.org.apache.tomcat>7.0.108</version.org.apache.tomcat>
     </properties>
 
     <dependencyManagement>

diff --git a/...a/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSpecificationProvider.java b/...a/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSpecificationProvider.java
@@ -65,7 +65,7 @@ public long getCreationTime() {
 
             @Override
             public long getLastAccessedTime() {
-                return session.getMetaData().getLastAccessedTime().toEpochMilli();
+                return session.getMetaData().getLastAccessStartTime().toEpochMilli();
             }
 
             @Override

diff --git a/8.5/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java b/8.5/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java
@@ -93,7 +93,7 @@ public String getIdInternal() {
     @Override
     public long getLastAccessedTime() {
         try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
-            return this.session.getMetaData().getLastAccessedTime().toEpochMilli();
+            return this.session.getMetaData().getLastAccessStartTime().toEpochMilli();
         }
     }
 
@@ -204,7 +204,7 @@ public void tellChangedSessionId(String newId, String oldId, boolean notifySessi
                 newSession.getAttributes().setAttribute(name, oldSession.getAttributes().getAttribute(name));
             }
             newSession.getMetaData().setMaxInactiveInterval(oldSession.getMetaData().getMaxInactiveInterval());
-            newSession.getMetaData().setLastAccessedTime(oldSession.getMetaData().getLastAccessedTime());
+            newSession.getMetaData().setLastAccess(oldSession.getMetaData().getLastAccessStartTime(), oldSession.getMetaData().getLastAccessEndTime());
             newSession.getLocalContext().setAuthType(oldSession.getLocalContext().getAuthType());
             newSession.getLocalContext().setPrincipal(oldSession.getLocalContext().getPrincipal());
             this.session = newSession;

diff --git a/8.5/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java b/8.5/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java
@@ -110,7 +110,7 @@ public long getCreationTime() {
     @Override
     public long getLastAccessedTime() {
         try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
-            return this.session.getMetaData().getLastAccessedTime().toEpochMilli();
+            return this.session.getMetaData().getLastAccessStartTime().toEpochMilli();
         }
     }
 

diff --git a/8.5/pom.xml b/8.5/pom.xml
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <version.org.apache.tomcat>8.5.61</version.org.apache.tomcat>
+        <version.org.apache.tomcat>8.5.63</version.org.apache.tomcat>
     </properties>
 
     <dependencyManagement>

diff --git a/...a/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSpecificationProvider.java b/...a/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaSpecificationProvider.java
@@ -65,7 +65,7 @@ public long getCreationTime() {
 
             @Override
             public long getLastAccessedTime() {
-                return session.getMetaData().getLastAccessedTime().toEpochMilli();
+                return session.getMetaData().getLastAccessStartTime().toEpochMilli();
             }
 
             @Override

diff --git a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/DistributableSession.java
@@ -93,7 +93,7 @@ public String getIdInternal() {
     @Override
     public long getLastAccessedTime() {
         try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
-            return this.session.getMetaData().getLastAccessedTime().toEpochMilli();
+            return this.session.getMetaData().getLastAccessStartTime().toEpochMilli();
         }
     }
 
@@ -204,7 +204,7 @@ public void tellChangedSessionId(String newId, String oldId, boolean notifySessi
                 newSession.getAttributes().setAttribute(name, oldSession.getAttributes().getAttribute(name));
             }
             newSession.getMetaData().setMaxInactiveInterval(oldSession.getMetaData().getMaxInactiveInterval());
-            newSession.getMetaData().setLastAccessedTime(oldSession.getMetaData().getLastAccessedTime());
+            newSession.getMetaData().setLastAccess(oldSession.getMetaData().getLastAccessStartTime(), oldSession.getMetaData().getLastAccessEndTime());
             newSession.getLocalContext().setAuthType(oldSession.getLocalContext().getAuthType());
             newSession.getLocalContext().setPrincipal(oldSession.getLocalContext().getPrincipal());
             this.session = newSession;

diff --git a/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java b/9.0/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/HttpSessionAdapter.java
@@ -110,7 +110,7 @@ public long getCreationTime() {
     @Override
     public long getLastAccessedTime() {
         try (BatchContext context = this.manager.getSessionManager().getBatcher().resumeBatch(this.batch)) {
-            return this.session.getMetaData().getLastAccessedTime().toEpochMilli();
+            return this.session.getMetaData().getLastAccessStartTime().toEpochMilli();
         }
     }
 

diff --git a/9.0/pom.xml b/9.0/pom.xml
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <version.org.apache.tomcat>9.0.41</version.org.apache.tomcat>
+        <version.org.apache.tomcat>9.0.43</version.org.apache.tomcat>
     </properties>
 
     <dependencyManagement>

diff --git a/common/src/main/java/org/wildfly/clustering/marshalling/jdk/ClassLoaderResolver.java b/common/src/main/java/org/wildfly/clustering/marshalling/jdk/ClassLoaderResolver.java
diff --git a/common/src/main/java/org/wildfly/clustering/marshalling/jdk/ClassResolver.java b/common/src/main/java/org/wildfly/clustering/marshalling/jdk/ClassResolver.java
diff --git a/common/src/main/java/org/wildfly/clustering/marshalling/jdk/JavaByteBufferMarshaller.java b/common/src/main/java/org/wildfly/clustering/marshalling/jdk/JavaByteBufferMarshaller.java
@@ -30,6 +30,7 @@
 import java.io.OutputStream;
 import java.io.Serializable;
 
+import org.wildfly.clustering.marshalling.Externalizer;
 import org.wildfly.clustering.marshalling.spi.ByteBufferMarshaller;
 
 /**
@@ -38,10 +39,10 @@
  * @author Paul Ferraro
  */
 public class JavaByteBufferMarshaller implements ByteBufferMarshaller {
-    private final ClassResolver resolver;
+    private final Externalizer<ClassLoader> externalizer;
 
-    public JavaByteBufferMarshaller(ClassResolver resolver) {
-        this.resolver = resolver;
+    public JavaByteBufferMarshaller(Externalizer<ClassLoader> externalizer) {
+        this.externalizer = externalizer;
     }
 
     @Override
@@ -51,7 +52,7 @@ public boolean isMarshallable(Object object) {
 
     @Override
     public Object readFrom(InputStream in) throws IOException {
-        try (ObjectInput input = new ObjectInputStream(in, this.resolver)) {
+        try (ObjectInput input = new ObjectInputStream(in, this.externalizer)) {
             return input.readObject();
         } catch (ClassNotFoundException e) {
             InvalidClassException exception = new InvalidClassException(e.getMessage());
@@ -62,7 +63,7 @@ public Object readFrom(InputStream in) throws IOException {
 
     @Override
     public void writeTo(OutputStream out, Object object) throws IOException {
-        try (ObjectOutput output = new ObjectOutputStream(out, this.resolver)) {
+        try (ObjectOutput output = new ObjectOutputStream(out, this.externalizer)) {
             output.writeObject(object);
         }
     }

diff --git a/common/src/main/java/org/wildfly/clustering/marshalling/jdk/ObjectInputStream.java b/common/src/main/java/org/wildfly/clustering/marshalling/jdk/ObjectInputStream.java
@@ -27,32 +27,35 @@
 import java.io.ObjectStreamClass;
 import java.lang.reflect.Proxy;
 
+import org.wildfly.clustering.marshalling.Externalizer;
+
 /**
- * An {@link java.io.ObjectInputStream} that resolves classes using a given {@link ClassResolver}.
+ * An {@link java.io.ObjectInputStream} that resolves classes using a given {@link ClassLoaderResolver}.
  * @author Paul Ferraro
  */
 public class ObjectInputStream extends java.io.ObjectInputStream {
 
-    private final ClassResolver resolver;
+    private final Externalizer<ClassLoader> externalizer;
 
-    public ObjectInputStream(InputStream input, ClassResolver resolver) throws IOException {
+    public ObjectInputStream(InputStream input, Externalizer<ClassLoader> externalizer) throws IOException {
         super(input);
-        this.resolver = resolver;
+        this.externalizer = externalizer;
     }
 
     @Override
     protected Class<?> resolveClass(ObjectStreamClass description) throws IOException, ClassNotFoundException {
-        return this.resolver.resolveClass(this, description.getName());
+        String className = description.getName();
+        return this.externalizer.readObject(this).loadClass(className);
     }
 
     @Override
     protected Class<?> resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
         Class<?>[] interfaceClasses = new Class<?>[interfaces.length];
         for (int i = 0; i < interfaces.length; ++i) {
-            interfaceClasses[i] = this.resolver.resolveClass(this, interfaces[i]);
+            interfaceClasses[i] = this.externalizer.readObject(this).loadClass(interfaces[i]);
         }
         try {
-            return Proxy.getProxyClass(this.resolver.getClassLoader(), interfaceClasses);
+            return Proxy.getProxyClass(this.externalizer.readObject(this), interfaceClasses);
         } catch (IllegalArgumentException e) {
             throw new ClassNotFoundException(null, e);
         }

diff --git a/common/src/main/java/org/wildfly/clustering/marshalling/jdk/ObjectOutputStream.java b/common/src/main/java/org/wildfly/clustering/marshalling/jdk/ObjectOutputStream.java
@@ -25,26 +25,31 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.wildfly.clustering.marshalling.Externalizer;
+
 /**
- * An {@link java.io.ObjectInputStream} that annotates classes using a given {@link ClassResolver}.
+ * An {@link java.io.ObjectInputStream} that annotates classes using a given {@link ClassLoaderResolver}.
  * @author Paul Ferraro
  */
 public class ObjectOutputStream extends java.io.ObjectOutputStream {
 
-    private final ClassResolver resolver;
+    private final Externalizer<ClassLoader> externalizer;
 
-    public ObjectOutputStream(OutputStream output, ClassResolver resolver) throws IOException {
+    public ObjectOutputStream(OutputStream output, Externalizer<ClassLoader> externalizer) throws IOException {
         super(output);
-        this.resolver = resolver;
+        this.externalizer = externalizer;
     }
 
     @Override
     protected void annotateClass(Class<?> targetClass) throws IOException {
-        this.resolver.annotateClass(this, targetClass);
+        this.externalizer.writeObject(this, targetClass.getClassLoader());
     }
 
     @Override
     protected void annotateProxyClass(Class<?> proxyClass) throws IOException {
-        this.resolver.annotateClass(this, proxyClass);
+        for (Class<?> interfaceClass : proxyClass.getInterfaces()) {
+            this.externalizer.writeObject(this, interfaceClass.getClassLoader());
+        }
+        this.externalizer.writeObject(this, proxyClass.getClassLoader());
     }
 }