[jboss-cvs] JBossCache/src/org/jboss/cache/loader ...

[Manik Surtani]

  User: msurtani
  Date: 06/10/09 12:31:36

  Modified:    src/org/jboss/cache/loader  JDBCCacheLoader.java
  Log:
  JBCACHE-802
  
  Revision  Changes    Path
  1.17      +50 -49    JBossCache/src/org/jboss/cache/loader/JDBCCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JDBCCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/JDBCCacheLoader.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- JDBCCacheLoader.java	22 Sep 2006 16:27:56 -0000	1.16
  +++ JDBCCacheLoader.java	9 Oct 2006 16:31:35 -0000	1.17
  @@ -80,7 +80,7 @@
    *
    * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
    * @author <a href="mailto:hmesha at novell.com">Hany Mesha </a>
  - * @version <tt>$Revision: 1.16 $</tt>
  + * @version <tt>$Revision: 1.17 $</tt>
    */
   public class JDBCCacheLoader extends AbstractCacheLoader
   {
  @@ -254,11 +254,11 @@
       *         </ul>
       * @throws Exception
       */
  -//   public Object get(Fqn name, Object key) throws Exception
  -//   {
  -//      Map node = loadNode(name);
  -//      return node == null || node == NULL_NODE_IN_ROW ? null : node.get(key);
  -//   }
  +   //   public Object get(Fqn name, Object key) throws Exception
  +   //   {
  +   //      Map node = loadNode(name);
  +   //      return node == null || node == NULL_NODE_IN_ROW ? null : node.get(key);
  +   //   }
   
      /**
       * Returns a map representing a node.
  @@ -823,12 +823,12 @@
            if (node == null)
            {
               //ps.setNull(1, Types.BLOB);
  -//            ps.setNull(1, Types.LONGVARBINARY);
  +            //            ps.setNull(1, Types.LONGVARBINARY);
               // don't set it to null - simply use an empty hash map.
               node = new HashMap(0);
            }
  -//         else
  -//         {
  +         //         else
  +         //         {
            Object marshalledNode = new MarshalledValue(node);
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            ObjectOutputStream oos = new ObjectOutputStream(baos);
  @@ -836,7 +836,7 @@
   
            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
            ps.setBinaryStream(1, bais, baos.size());
  -//         }
  +         //         }
   
            ps.setString(2, name.toString());
   
  @@ -1221,6 +1221,7 @@
               try
               {
                  con = DriverManager.getConnection(url, usr, pwd);
  +               connection.set(con);
               }
               catch (SQLException e)
               {