You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/22 17:47:51 UTC
svn commit: r1174225 - in /openejb/trunk/openejb3/tck:
cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/
cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/
cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/
Author: dblevins
Date: Thu Sep 22 15:47:51 2011
New Revision: 1174225
URL: http://svn.apache.org/viewvc?rev=1174225&view=rev
Log:
Mark the serialization event as clearly coming from a passivation attempt to ensure the proxy that is written will be the local version and not the ejbd version
Modified:
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java
openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java
Modified: openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java?rev=1174225&r1=1174224&r2=1174225&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java (original)
+++ openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java Thu Sep 22 15:47:51 2011
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tck.cdi.embedded;
+import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
import org.apache.openejb.core.ivm.IntraVmProxy;
import java.io.ByteArrayInputStream;
@@ -36,11 +37,16 @@ public class BeansImpl implements org.jb
@Override
public byte[] serialize(Object instance) throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream os = new ObjectOutputStream(baos);
- os.writeObject(instance);
- os.flush();
- return baos.toByteArray();
+ IntraVmCopyMonitor.prePassivationOperation();
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream os = new ObjectOutputStream(baos);
+ os.writeObject(instance);
+ os.flush();
+ return baos.toByteArray();
+ } finally {
+ IntraVmCopyMonitor.postPassivationOperation();
+ }
}
@Override
Modified: openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java?rev=1174225&r1=1174224&r2=1174225&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/BeansImpl.java Thu Sep 22 15:47:51 2011
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tck.cdi.tomee.embedded;
+import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
import org.apache.openejb.core.ivm.IntraVmProxy;
import java.io.ByteArrayInputStream;
@@ -36,11 +37,16 @@ public class BeansImpl implements org.jb
@Override
public byte[] serialize(Object instance) throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream os = new ObjectOutputStream(baos);
- os.writeObject(instance);
- os.flush();
- return baos.toByteArray();
+ IntraVmCopyMonitor.prePassivationOperation();
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream os = new ObjectOutputStream(baos);
+ os.writeObject(instance);
+ os.flush();
+ return baos.toByteArray();
+ } finally {
+ IntraVmCopyMonitor.postPassivationOperation();
+ }
}
@Override
Modified: openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java?rev=1174225&r1=1174224&r2=1174225&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/BeansImpl.java Thu Sep 22 15:47:51 2011
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tck.cdi.tomee;
+import org.apache.openejb.core.ivm.IntraVmCopyMonitor;
import org.apache.openejb.core.ivm.IntraVmProxy;
import java.io.ByteArrayInputStream;
@@ -39,11 +40,16 @@ public class BeansImpl implements org.jb
@Override
public byte[] serialize(Object instance) throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream os = new ObjectOutputStream(baos);
- os.writeObject(instance);
- os.flush();
- return baos.toByteArray();
+ IntraVmCopyMonitor.prePassivationOperation();
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream os = new ObjectOutputStream(baos);
+ os.writeObject(instance);
+ os.flush();
+ return baos.toByteArray();
+ } finally {
+ IntraVmCopyMonitor.postPassivationOperation();
+ }
}
@Override