You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2014/09/07 20:59:43 UTC
svn commit: r1623087 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component:
InjectionTargetBean.java PassivationBeanWrapper.java
ProducerAwareInjectionTargetBean.java
Author: rmannibucau
Date: Sun Sep 7 18:59:42 2014
New Revision: 1623087
URL: http://svn.apache.org/r1623087
Log:
sharing PassivationBeanWrapper
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PassivationBeanWrapper.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java?rev=1623087&r1=1623086&r2=1623087&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java Sun Sep 7 18:59:42 2014
@@ -110,7 +110,7 @@ public class InjectionTargetBean<T> exte
}
/**
- * This uses the {@link org.apache.webbeans.component.InjectionTargetBean.PassivationBeanWrapper}
+ * This uses the {@link org.apache.webbeans.component.PassivationBeanWrapper}
* to only store the beanPassivationId.
*/
private Object writeReplace() throws ObjectStreamException
@@ -123,24 +123,4 @@ public class InjectionTargetBean<T> exte
return new PassivationBeanWrapper(passivationId);
}
-
-
- public static class PassivationBeanWrapper implements Serializable
- {
- private static final long serialVersionUID = -7588343501478247476L;
-
- private final String passivationId;
-
- public PassivationBeanWrapper(String passivationId)
- {
- this.passivationId = passivationId;
- }
-
- private Object readResolve() throws ObjectStreamException
- {
- WebBeansContext webBeansContext = WebBeansContext.getInstance();
- return webBeansContext.getBeanManagerImpl().getPassivationCapableBean(passivationId);
- }
-
- }
}
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PassivationBeanWrapper.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PassivationBeanWrapper.java?rev=1623087&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PassivationBeanWrapper.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/PassivationBeanWrapper.java Sun Sep 7 18:59:42 2014
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.component;
+
+import org.apache.webbeans.config.WebBeansContext;
+
+import java.io.ObjectStreamException;
+
+public class PassivationBeanWrapper {
+ private static final long serialVersionUID = 1L;
+
+ private final String passivationId;
+
+ public PassivationBeanWrapper(final String passivationId)
+ {
+ this.passivationId = passivationId;
+ }
+
+ private Object readResolve() throws ObjectStreamException
+ {
+ WebBeansContext webBeansContext = WebBeansContext.getInstance();
+ return webBeansContext.getBeanManagerImpl().getPassivationCapableBean(passivationId);
+ }
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java?rev=1623087&r1=1623086&r2=1623087&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerAwareInjectionTargetBean.java Sun Sep 7 18:59:42 2014
@@ -67,22 +67,4 @@ public class ProducerAwareInjectionTarge
}
return new PassivationBeanWrapper(passivationId);
}
-
-
- public static class PassivationBeanWrapper implements Serializable
- {
- private static final long serialVersionUID = 1L;
-
- private final String passivationId;
-
- public PassivationBeanWrapper(final String passivationId)
- {
- this.passivationId = passivationId;
- }
-
- private Object readResolve() throws ObjectStreamException
- {
- return WebBeansContext.getInstance().getBeanManagerImpl().getPassivationCapableBean(passivationId);
- }
- }
}