You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by py...@apache.org on 2007/04/26 10:06:29 UTC
svn commit: r532647 - in /harmony/enhanced/classlib/trunk/modules/beans/src:
main/java/java/beans/beancontext/BeanContextSupport.java
test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Author: pyang
Date: Thu Apr 26 01:06:29 2007
New Revision: 532647
URL: http://svn.apache.org/viewvc?view=rev&rev=532647
Log:
Apply patch for HARMONY-3757([classlib][beans]java.beans.beancontext.BeanContextServicesSupport has problem in self-deserialization)
Modified:
harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?view=diff&rev=532647&r1=532646&r2=532647
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java Thu Apr 26 01:06:29 2007
@@ -435,7 +435,7 @@
while (true) {
Object l = ois.readObject();
- if (l != null && l.equals("EOS")) { //$NON-NLS-1$
+ if ("EOS".equals(l)) { //$NON-NLS-1$
coll.add(l);
} else {
break;
Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java?view=diff&rev=532647&r1=532646&r2=532647
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java Thu Apr 26 01:06:29 2007
@@ -2163,5 +2163,16 @@
p.addPropertyChangeListener(s);
p.firePropertyChange(null, new Object(), new Object());
}
+
+ //Regression Test for HARMONY-3757
+ public void testSelfSerializatoin() throws Exception {
+ BeanContextSupport beanContextSupport = new BeanContextSupport();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ new ObjectOutputStream(baos).writeObject(beanContextSupport);
+ ObjectInputStream oin = new ObjectInputStream(new ByteArrayInputStream(
+ baos.toByteArray()));
+ Object obj = oin.readObject();
+ assertTrue(obj instanceof BeanContextSupport);
+ }
}