Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 53490 invoked from network); 5 Feb 2010 23:18:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Feb 2010 23:18:38 -0000 Received: (qmail 46174 invoked by uid 500); 5 Feb 2010 23:18:38 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 46146 invoked by uid 500); 5 Feb 2010 23:18:38 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 46136 invoked by uid 99); 5 Feb 2010 23:18:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Feb 2010 23:18:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Feb 2010 23:18:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 909FA238890A; Fri, 5 Feb 2010 23:18:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r907128 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/container/SerializableBean.java test/java/org/apache/webbeans/newtests/contexts/SerializationTest.java Date: Fri, 05 Feb 2010 23:18:14 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100205231814.909FA238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: struberg Date: Fri Feb 5 23:18:14 2010 New Revision: 907128 URL: http://svn.apache.org/viewvc?rev=907128&view=rev Log: OWB-6 force SerializableBean construction via SerializableBeanVault and add JavaDoc Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/contexts/SerializationTest.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java?rev=907128&r1=907127&r2=907128&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java Fri Feb 5 23:18:14 2010 @@ -49,19 +49,25 @@ private Bean bean; private String id; - + /** - * @return the deletaged internal Bean. + * @return the delegated internal Bean. */ public Bean getBean() { return bean; } - public SerializableBean(Bean bean, String id) + /** + * This constructor shall not be invoked directly, but only get called + * from {@link org.apache.webbeans.container.SerializableBeanVault} + * @param bean the PassivationCapable bean which should be made Serializable + * @param id the {@link javax.enterprise.inject.spi.PassivationCapable#getId()} + */ + SerializableBean(Bean bean, String id) { this.bean = bean; - this.id = id; + this.id = id; } @Override Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/contexts/SerializationTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/contexts/SerializationTest.java?rev=907128&r1=907127&r2=907128&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/contexts/SerializationTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/contexts/SerializationTest.java Fri Feb 5 23:18:14 2010 @@ -19,6 +19,7 @@ */ import org.apache.webbeans.container.SerializableBean; +import org.apache.webbeans.container.SerializableBeanVault; import org.apache.webbeans.newtests.AbstractUnitTest; import org.apache.webbeans.newtests.contexts.session.common.PersonalDataBean; import org.apache.webbeans.newtests.decorators.multiple.Decorator1; @@ -97,7 +98,7 @@ String id = null; if((id = WebBeansUtil.isPassivationCapable(bean)) != null) { - bean = new SerializableBean(bean,id); + bean = (Bean) SerializableBeanVault.getInstance().getSerializableBean(bean); byte[] serial = serializeBean(bean); Bean b2 = deSerializeBean(serial);