[jboss-cvs] JBossAS SVN: r69179 - projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-01-21 14:39:45 -0500 (Mon, 21 Jan 2008)
New Revision: 69179

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyCacheKey.java
Log:
[JBAOP-467] Fix failing test SimpleSerialiizationTestCase.testProxy

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyCacheKey.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyCacheKey.java	2008-01-21 19:06:13 UTC (rev 69178)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyCacheKey.java	2008-01-21 19:39:45 UTC (rev 69179)
@@ -256,10 +256,14 @@
        out.writeUTF(managerFqn);
        out.writeObject(guid);
        out.writeObject(clazzRef.get());
-       Class[] ifs = new Class[addedInterfaces.length];
-       for (int i = 0 ; i < addedInterfaces.length ; i++)
+       Class[] ifs = null;
+       if (addedInterfaces != null)
        {
-          ifs[i] = addedInterfaces[i].get();
+          ifs = new Class[addedInterfaces.length];
+          for (int i = 0 ; i < addedInterfaces.length ; i++)
+          {
+             ifs[i] = addedInterfaces[i].get();
+          }
        }
        out.writeObject(ifs);
        out.writeObject(metaData);
@@ -273,10 +277,13 @@
        guid = (GUID)in.readObject();
        clazzRef = new WeakReference<Class>((Class)in.readObject());
        Class[] ifs = (Class[])in.readObject();
-       addedInterfaces = new WeakReference[ifs.length];
-       for (int i = 0 ; i < ifs.length ; i++)
+       if (ifs != null)
        {
-          addedInterfaces[i] = new WeakReference<Class>(ifs[i]);
+          addedInterfaces = new WeakReference[ifs.length];
+          for (int i = 0 ; i < ifs.length ; i++)
+          {
+             addedInterfaces[i] = new WeakReference<Class>(ifs[i]);
+          }
        }
        metaData = (MetaData)in.readObject();
        addedMixins = (AOPProxyFactoryMixin[])in.readObject();