Use ObjectInputStreamFiltered
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb507494 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb507494 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb507494 Branch: refs/heads/tomee-7.0.0-M1 Commit: eb5074943832b2b9ad410a25f2d38b352eb24f23 Parents: a7a915f Author: AndyGee <andy...@gmx.de> Authored: Thu Dec 3 04:11:13 2015 +0100 Committer: AndyGee <andy...@gmx.de> Committed: Thu Dec 3 04:11:13 2015 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/timer/EjbTimerImplSerializableTest.java | 3 ++- .../SerializationOfTransactionRolledBackExceptionTest.java | 3 ++- .../java/org/apache/openejb/util/PojoExternalizationTest.java | 5 +++-- .../java/org/apache/openejb/util/PojoSerializationTest.java | 5 +++-- .../openejb/util/proxy/LocalBeanProxySerializationTest.java | 3 ++- .../openejb/util/proxy/LocalReferenceSerializationTest.java | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java b/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java index b0a951d..daabbc5 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/timer/EjbTimerImplSerializableTest.java @@ -18,6 +18,7 @@ package org.apache.openejb.timer; import org.apache.openejb.BeanContext; import org.apache.openejb.MethodContext; +import org.apache.openejb.core.ObjectInputStreamFiltered; import org.apache.openejb.core.timer.CalendarTimerData; import org.apache.openejb.core.timer.EjbTimeoutJob; import org.apache.openejb.core.timer.EjbTimerService; @@ -113,7 +114,7 @@ public class EjbTimerImplSerializableTest { private static Object deserialize(final byte[] serial) throws Exception { final ByteArrayInputStream bais = new ByteArrayInputStream(serial); - final ObjectInputStream ois = new ObjectInputStream(bais); + final ObjectInputStream ois = new ObjectInputStreamFiltered(bais); return ois.readObject(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java b/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java index 369a494..c6a2d98 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/transaction/SerializationOfTransactionRolledBackExceptionTest.java @@ -16,6 +16,7 @@ */ package org.apache.openejb.transaction; +import org.apache.openejb.core.ObjectInputStreamFiltered; import org.junit.Test; import javax.transaction.TransactionRolledbackException; @@ -42,7 +43,7 @@ public class SerializationOfTransactionRolledBackExceptionTest { private static Object deserialize(final byte[] serial) throws Exception { final ByteArrayInputStream bais = new ByteArrayInputStream(serial); - final ObjectInputStream ois = new ObjectInputStream(bais); + final ObjectInputStream ois = new ObjectInputStreamFiltered(bais); return ois.readObject(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java index e8b49ab..a269a50 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/util/PojoExternalizationTest.java @@ -17,6 +17,7 @@ package org.apache.openejb.util; import junit.framework.TestCase; +import org.apache.openejb.core.ObjectInputStreamFiltered; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -47,7 +48,7 @@ public class PojoExternalizationTest extends TestCase { out.close(); final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - final ObjectInputStream in = new ObjectInputStream(bais); + final ObjectInputStream in = new ObjectInputStreamFiltered(bais); for (int i = count; i > 0; i--) { final Green actual = (Green) in.readObject(); @@ -69,7 +70,7 @@ public class PojoExternalizationTest extends TestCase { out.close(); final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - final ObjectInputStream in = new ObjectInputStream(bais); + final ObjectInputStream in = new ObjectInputStreamFiltered(bais); final Green actual = (Green) in.readObject(); assertEquals(green, actual); http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/util/PojoSerializationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/PojoSerializationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/PojoSerializationTest.java index 6603a74..a661498 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/util/PojoSerializationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/util/PojoSerializationTest.java @@ -17,6 +17,7 @@ package org.apache.openejb.util; import junit.framework.TestCase; +import org.apache.openejb.core.ObjectInputStreamFiltered; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -47,7 +48,7 @@ public class PojoSerializationTest extends TestCase { out.close(); final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - final ObjectInputStream in = new ObjectInputStream(bais); + final ObjectInputStream in = new ObjectInputStreamFiltered(bais); for (int i = count; i > 0; i--) { final Green actual = (Green) in.readObject(); @@ -69,7 +70,7 @@ public class PojoSerializationTest extends TestCase { out.close(); final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - final ObjectInputStream in = new ObjectInputStream(bais); + final ObjectInputStream in = new ObjectInputStreamFiltered(bais); final Green actual = (Green) in.readObject(); assertEquals(green, actual); http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java index 27a6eda..35cd691 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxySerializationTest.java @@ -17,6 +17,7 @@ package org.apache.openejb.util.proxy; +import org.apache.openejb.core.ObjectInputStreamFiltered; import org.apache.openejb.jee.Empty; import org.apache.openejb.jee.StatelessBean; import org.apache.openejb.junit.ApplicationComposer; @@ -54,7 +55,7 @@ public class LocalBeanProxySerializationTest { oos.writeObject(bean); final ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray()); - final ObjectInputStream ois = new ObjectInputStream(bis); + final ObjectInputStream ois = new ObjectInputStreamFiltered(bis); final SampleLocalBean deserialized = (SampleLocalBean) ois.readObject(); assertEquals(5, deserialized.add(2, 3)); } http://git-wip-us.apache.org/repos/asf/tomee/blob/eb507494/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalReferenceSerializationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalReferenceSerializationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalReferenceSerializationTest.java index 0b3acc9..0167d81 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalReferenceSerializationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalReferenceSerializationTest.java @@ -18,6 +18,7 @@ package org.apache.openejb.util.proxy; import org.apache.openejb.ProxyInfo; +import org.apache.openejb.core.ObjectInputStreamFiltered; import org.apache.openejb.core.ServerFederation; import org.apache.openejb.jee.EjbJar; import org.apache.openejb.jee.StatelessBean; @@ -102,7 +103,7 @@ public class LocalReferenceSerializationTest { oos.writeObject(bean); final ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray()); - final ObjectInputStream ois = new ObjectInputStream(bis); + final ObjectInputStream ois = new ObjectInputStreamFiltered(bis); return (T) ois.readObject(); }
