[exo-jcr-commits] exo-jcr SVN: r1316 - 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: 2010-01-07 15:29:34 -0500 (Thu, 07 Jan 2010)
New Revision: 1316

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: getProperties without value updated

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	2010-01-07 16:38:57 UTC (rev 1315)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java	2010-01-07 20:29:34 UTC (rev 1316)
@@ -619,11 +619,15 @@
          do
          {
             int orderNum = resultSet.getInt(COLUMN_VORDERNUM);
-            final String storageId = resultSet.getString(COLUMN_VSTORAGE_DESC);
-            ValueData vdata =
-               resultSet.wasNull() ? readValueData(cid, orderNum, cversion, resultSet.getBinaryStream(COLUMN_VDATA))
-                  : readValueData(identifier, orderNum, storageId);
-            data.add(vdata);
+            //check is there value columns
+            if (!resultSet.wasNull())
+            {
+               final String storageId = resultSet.getString(COLUMN_VSTORAGE_DESC);
+               ValueData vdata =
+                  resultSet.wasNull() ? readValueData(cid, orderNum, cversion, resultSet.getBinaryStream(COLUMN_VDATA))
+                     : readValueData(identifier, orderNum, storageId);
+               data.add(vdata);
+            }
          }
          while (resultSet.next() && resultSet.getString(COLUMN_ID).equals(cid));