From jbosscache-commits at lists.jboss.org Sat Jan  3 22:21:39 2009
Content-Type: multipart/mixed; boundary="===============8265567013590289668=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r7344 -
 core/branches/1.4.X/src/org/jboss/cache/loader.
Date: Sat, 03 Jan 2009 22:21:39 -0500
Message-ID: <E1LJJYZ-0002YK-8M@committer01.frg.pub.inap.atl.jboss.com>

--===============8265567013590289668==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jiwils
Date: 2009-01-03 22:21:39 -0500 (Sat, 03 Jan 2009)
New Revision: 7344

Modified:
   core/branches/1.4.X/src/org/jboss/cache/loader/JDBCExtendedCacheLoader.j=
ava
Log:
Fix for JBCACHE-1453.  Persistent state transfer now loops using the ByteAr=
rayInputStream's available method rather than the wrapper MarshalledValueIn=
putStream.

Modified: core/branches/1.4.X/src/org/jboss/cache/loader/JDBCExtendedCacheL=
oader.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/branches/1.4.X/src/org/jboss/cache/loader/JDBCExtendedCacheLoader.=
java	2009-01-04 03:17:17 UTC (rev 7343)
+++ core/branches/1.4.X/src/org/jboss/cache/loader/JDBCExtendedCacheLoader.=
java	2009-01-04 03:21:39 UTC (rev 7344)
@@ -18,23 +18,23 @@
 import org.jboss.invocation.MarshalledValueOutputStream;
 =

 /**
- * A A <code>JDBCCacheLoader</code> that implements =

+ * A A <code>JDBCCacheLoader</code> that implements
  * <code>ExtendedCacheLoader</code>.
- * =

+ *
  * @author <a href=3D"mailto://brian.stansberry(a)jboss.com">Brian Stansbe=
rry</a>
  * @version $Id$
  */
 public class JDBCExtendedCacheLoader extends JDBCCacheLoader implements Ex=
tendedCacheLoader
 {
    // --------------------------------------------------------  Instance F=
ields
-   =

+
    private RegionManager manager_;
-   =

+
    // -----------------------------------------------------------  Constru=
ctors
 =

    /**
     * Create a new JDBCExtendedCacheLoader.
-    * =

+    *
     */
    public JDBCExtendedCacheLoader()
    {
@@ -50,7 +50,7 @@
       {
          // Set the TCCL to any classloader registered for subtree
          setUnmarshallingClassLoader(subtree);
-         =

+
          ByteArrayOutputStream out_stream=3Dnew ByteArrayOutputStream(1024=
);
          ObjectOutputStream    out=3Dnew MarshalledValueOutputStream(out_s=
tream);
          loadState(subtree, out);
@@ -71,28 +71,28 @@
       {
          // Set the TCCL to any classloader registered for subtree
          setUnmarshallingClassLoader(subtree);
-         =

+
          ByteArrayInputStream in_stream=3Dnew ByteArrayInputStream(state);
          MarshalledValueInputStream in=3Dnew MarshalledValueInputStream(in=
_stream);
          NodeData nd;
-   =

+
          // remove entire existing state
          this.remove(subtree);
-         =

-         boolean moveToBuddy =3D =

+
+         boolean moveToBuddy =3D
             subtree.isChildOf(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN) && su=
btree.size() > 1;
-   =

+
          // store new state
          Fqn fqn =3D null;
-         while(in.available() > 0) =

+         while(in_stream.available() > 0)
          {
             nd=3D(NodeData)in.readObject();
-            =

+
             if (moveToBuddy)
                fqn =3D BuddyManager.getBackupFqn(subtree, nd.fqn);
             else
                fqn =3D nd.fqn;
-   =

+
             if(nd.attrs !=3D null)
                this.put(fqn, nd.attrs, true); // creates a node with 0 or =
more attributes
             else
@@ -132,16 +132,16 @@
    {
       storeState(state, Fqn.fromString("/"));
    }
-   =

 =

 =

 =

+
    // -------------------------------------------------------  Private Met=
hods
 =

    /**
-    * Checks the RegionManager for a classloader registered for the =

+    * Checks the RegionManager for a classloader registered for the
     * given, and if found sets it as the TCCL
-    * =

+    *
     * @param subtree
     */
    private void setUnmarshallingClassLoader(Fqn subtree)


--===============8265567013590289668==--