[exo-jcr-commits] exo-jcr SVN: r1253 - jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation.

[do-not-reply at jboss.org]

Author: sergiykarpenko
Date: 2009-12-30 06:23:18 -0500 (Wed, 30 Dec 2009)
New Revision: 1253

Modified:
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
Log:
EXOJCR-302: CQJDBCStorageConnection loadProperty bug fixed

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java	2009-12-30 11:13:52 UTC (rev 1252)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java	2009-12-30 11:23:18 UTC (rev 1253)
@@ -33,9 +33,7 @@
 import org.exoplatform.services.jcr.datamodel.ValueData;
 import org.exoplatform.services.jcr.impl.Constants;
 import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCStorageConnection;
-import org.exoplatform.services.jcr.impl.storage.value.ValueStorageNotFoundException;
 import org.exoplatform.services.jcr.impl.util.io.FileCleaner;
-import org.exoplatform.services.jcr.storage.value.ValueIOChannel;
 import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider;
 
 import java.io.File;
@@ -660,7 +658,7 @@
                   : readValueData(identifier, orderNum, storageId);
             data.add(vdata);
          }
-         while (resultSet.next() && resultSet.getString(COLUMN_ID) == cid);
+         while (resultSet.next() && resultSet.getString(COLUMN_ID).equals(cid));
 
          PersistedPropertyData pdata =
             new PersistedPropertyData(identifier, qpath, getIdentifier(cpid), cversion, cptype, cpmultivalued, data);
@@ -678,37 +676,6 @@
       }
    }
 
-   /**
-    * Read ValueData from External Storage.
-    * 
-    * @param pdata
-    *          PropertyData
-    * @param orderNumber
-    *          Value order number
-    * @param storageId
-    *          external Value storage id
-    * @return ValueData
-    * @throws SQLException
-    *           database error
-    * @throws IOException
-    *           I/O error
-    * @throws ValueStorageNotFoundException
-    *           if no such storage found with Value storageId
-    */
-   protected ValueData readValueData(String identifier, int orderNumber, String storageId) throws SQLException,
-      IOException, ValueStorageNotFoundException
-   {
-      ValueIOChannel channel = valueStorageProvider.getChannel(storageId);
-      try
-      {
-         return channel.read(identifier, orderNumber, maxBufferSize);
-      }
-      finally
-      {
-         channel.close();
-      }
-   }
-
    //   protected PersistedNodeData loadNodeRecord(ResultSet item, QPath parentPath, AccessControlList pACL)
    //      throws RepositoryException, SQLException, IOException
    //   {