[exo-jcr-commits] exo-jcr SVN: r1255 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core: src/main/java/org/exoplatform/services/jcr/datamodel and 1 other directories.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2009-12-30 06:44:23 -0500 (Wed, 30 Dec 2009)
New Revision: 1255

Modified:
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/pom.xml
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/ValueData.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/GenericCQConnectionFactory.java
Log:
EXOJCR-358: fix

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/pom.xml	2009-12-30 11:40:02 UTC (rev 1254)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/pom.xml	2009-12-30 11:44:23 UTC (rev 1255)
@@ -567,9 +567,7 @@
                         </property>
                      </systemProperties>
                      <includes>
-                        <include>**/**/TestErrorMultithreading__.java</include>
-                        <include>**/**/TestConcurrentItems__.java</include>
-                        <include>**/**/TestInvalidItemState__.java</include>
+                        <include>**/**/TestGetNodesPerf.java</include>
                      </includes>
                   </configuration>
                </plugin>

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/ValueData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/ValueData.java	2009-12-30 11:40:02 UTC (rev 1254)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/ValueData.java	2009-12-30 11:44:23 UTC (rev 1255)
@@ -31,15 +31,6 @@
 public interface ValueData
 {
 
-   // TODO cleanup
-   //   /**
-   //    * Set Value order number.
-   //    * 
-   //    * @param orderNum
-   //    *          int, Value order number
-   //    */
-   //   void setOrderNumber(int orderNum);
-
    /**
     * Return Value order number.
     * 

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/GenericCQConnectionFactory.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/GenericCQConnectionFactory.java	2009-12-30 11:40:02 UTC (rev 1254)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/GenericCQConnectionFactory.java	2009-12-30 11:44:23 UTC (rev 1255)
@@ -19,7 +19,6 @@
 package org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.db;
 
 import org.exoplatform.services.jcr.impl.storage.jdbc.db.GenericConnectionFactory;
-import org.exoplatform.services.jcr.impl.storage.jdbc.monitor.ManagedConnection;
 import org.exoplatform.services.jcr.impl.util.io.FileCleaner;
 import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection;
 import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider;
@@ -199,7 +198,7 @@
          if (readOnly) // set this feature only if it asked
             conn.setReadOnly(readOnly);
 
-         return monitorInterest == 0 ? conn : new ManagedConnection(conn, monitorInterest);
+         return monitorInterest == 0 ? conn : null;
       }
       catch (SQLException e)
       {