AS7-3716 fix NPE

silveringsea · Feb 13, 2012 · 80f96e6 · 80f96e6
1 parent 5d78387
commit 80f96e6
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/.../java/org/jboss/as/ejb3/component/stateful/StatefulSessionBeanSerializabilityChecker.java b/.../java/org/jboss/as/ejb3/component/stateful/StatefulSessionBeanSerializabilityChecker.java
@@ -41,6 +41,9 @@ public StatefulSessionBeanSerializabilityChecker(Class<?> beanClass) {
      */
     @Override
     public boolean isSerializable(Class<?> clazz) {
-        return this.beanClass == clazz || DEFAULT.isSerializable(clazz);
+        if(clazz == Object.class) {
+            return false;
+        }
+        return DEFAULT.isSerializable(clazz) || clazz.isAssignableFrom(this.beanClass);
     }
 }
diff --git a/...g/jboss/as/test/integration/ejb/stateful/passivation/PassivationSucceedsUnitTestCase.java b/...g/jboss/as/test/integration/ejb/stateful/passivation/PassivationSucceedsUnitTestCase.java
@@ -149,6 +149,8 @@ public void testPassivationMaxSize() throws Exception {
         Assert.assertTrue("@PrePassivate not called, check cache configuration and client sleep time", remote2.hasBeenPassivated());
         Assert.assertTrue(remote1.isPersistenceContextSame());
         Assert.assertTrue(remote2.isPersistenceContextSame());
+        Assert.assertEquals("Super", remote1.getSuperEmployee().getName());
+        Assert.assertEquals("Super", remote2.getSuperEmployee().getName());
 
         remote1.remove();
         remote2.remove();

diff --git a/...st/java/org/jboss/as/test/integration/ejb/stateful/passivation/PassivationSuperClass.java b/...st/java/org/jboss/as/test/integration/ejb/stateful/passivation/PassivationSuperClass.java
@@ -0,0 +1,26 @@
+package org.jboss.as.test.integration.ejb.stateful.passivation;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * AS7-3716
+ *
+ * We also need to make sure that a beans super class is still serialized even when it is not
+ * marked serializable
+ *
+ * @author Stuart Douglas
+ */
+public class PassivationSuperClass {
+
+    private Employee superEmployee;
+
+    @PostConstruct
+    private void postConstruct() {
+        superEmployee = new Employee();
+        superEmployee.setName("Super");
+    }
+
+    public Employee getSuperEmployee() {
+        return superEmployee;
+    }
+}
diff --git a/...test/java/org/jboss/as/test/integration/ejb/stateful/passivation/TestPassivationBean.java b/...test/java/org/jboss/as/test/integration/ejb/stateful/passivation/TestPassivationBean.java
@@ -45,7 +45,7 @@
 @Stateful
 @Remote(TestPassivationRemote.class)
 @Cache("passivating")
-public class TestPassivationBean implements TestPassivationRemote {
+public class TestPassivationBean extends PassivationSuperClass implements TestPassivationRemote {
     private static final Logger log = Logger.getLogger(TestPassivationBean.class);
 
     @PersistenceContext(type = PersistenceContextType.EXTENDED)
@@ -126,4 +126,6 @@ public void setActivateFlag() {
     public void remove() {
         log.info("Bean [" +  this.identificator + "] removing");
     }
+
+
 }
diff --git a/...st/java/org/jboss/as/test/integration/ejb/stateful/passivation/TestPassivationRemote.java b/...st/java/org/jboss/as/test/integration/ejb/stateful/passivation/TestPassivationRemote.java
@@ -55,4 +55,6 @@ public interface TestPassivationRemote {
      * Annotate for removing.
      */
     void remove();
+
+    Employee getSuperEmployee();
 }