You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2012/04/01 22:34:32 UTC
svn commit: r1308195 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
container/SerializableBean.java context/AbstractContext.java
context/creational/CreationalContextImpl.java
context/creational/DependentCreationalContext.java
Author: struberg
Date: Sun Apr 1 20:34:31 2012
New Revision: 1308195
URL: http://svn.apache.org/viewvc?rev=1308195&view=rev
Log:
readObjecct and writeObject doesn't need to be serializable
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.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=1308195&r1=1308194&r2=1308195&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 Sun Apr 1 20:34:31 2012
@@ -129,7 +129,7 @@ public final class SerializableBean<T> i
return ((OwbBean<?>) bean).getId();
}
- private synchronized void writeObject(ObjectOutputStream s)
+ private void writeObject(ObjectOutputStream s)
throws IOException
{
String id = getId();
@@ -143,7 +143,7 @@ public final class SerializableBean<T> i
@SuppressWarnings("unchecked")
- private synchronized void readObject(ObjectInputStream s)
+ private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
String id = (String) s.readObject();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1308195&r1=1308194&r2=1308195&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Sun Apr 1 20:34:31 2012
@@ -353,7 +353,7 @@ public abstract class AbstractContext im
/**
* Write Object.
*/
- private synchronized void writeObject(ObjectOutputStream s)
+ private void writeObject(ObjectOutputStream s)
throws IOException
{
s.writeObject(type);
@@ -385,8 +385,7 @@ public abstract class AbstractContext im
/**
* Read object.
*/
- @SuppressWarnings("unchecked")
- private synchronized void readObject(ObjectInputStream s)
+ private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
type = (ContextTypes) s.readObject();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1308195&r1=1308194&r2=1308195&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Sun Apr 1 20:34:31 2012
@@ -350,7 +350,7 @@ public class CreationalContextImpl<T> im
/**
* Write Object.
*/
- private synchronized void writeObject(ObjectOutputStream s)
+ private void writeObject(ObjectOutputStream s)
throws IOException
{
s.writeObject(dependentObjects);
@@ -372,7 +372,7 @@ public class CreationalContextImpl<T> im
* Read object.
*/
@SuppressWarnings("unchecked")
- private synchronized void readObject(ObjectInputStream s)
+ private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
webBeansContext = WebBeansContext.currentInstance();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.java?rev=1308195&r1=1308194&r2=1308195&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/DependentCreationalContext.java Sun Apr 1 20:34:31 2012
@@ -100,7 +100,7 @@ public class DependentCreationalContext<
return contextual;
}
- private synchronized void writeObject(ObjectOutputStream s)
+ private void writeObject(ObjectOutputStream s)
throws IOException
{
s.writeObject(dependentType);
@@ -128,7 +128,7 @@ public class DependentCreationalContext<
@SuppressWarnings("unchecked")
- private synchronized void readObject(ObjectInputStream s)
+ private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
dependentType = (DependentType) s.readObject();
@@ -143,4 +143,4 @@ public class DependentCreationalContext<
}
}
-}
\ No newline at end of file
+}