[exo-jcr-commits] exo-jcr SVN: r5165 - in jcr/branches/1.12.x: patch/1.12.11-GA/JCR-1660 and 1 other directory.

[do-not-reply at jboss.org]

Author: trang_vu
Date: 2011-11-04 08:20:37 -0400 (Fri, 04 Nov 2011)
New Revision: 5165

Added:
   jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1660/readme.txt
Modified:
   jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java
Log:
JCR-1660: Problems during testing of Lock operations (EditLockedCommonNodeTest, EditLockedCommonDeepNodeTest)

Fix description
* Check whether the parent node is locked or not.
* Then try to check whether the property exists or not.


Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java	2011-11-04 11:57:14 UTC (rev 5164)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java	2011-11-04 12:20:37 UTC (rev 5165)
@@ -410,6 +410,18 @@
       ConstraintViolationException, RepositoryException
    {
 
+      // Check if checked-in (versionable)
+      if (!parentNode.checkedOut())
+      {
+         throw new VersionException("Node " + parentNode.getPath() + " or its nearest ancestor is checked-in");
+      }
+
+      // Check is locked
+      if (!parentNode.checkLocking())
+      {
+         throw new LockException("Node " + parentNode.getPath() + " is locked ");
+      }
+
       QPath qpath = QPath.makeChildPath(parentNode.getInternalPath(), propertyName);
 
       int state;
@@ -486,18 +498,6 @@
             + locationFactory.createJCRPath(qpath).getAsString(false));
       }
 
-      // Check if checked-in (versionable)
-      if (!parentNode.checkedOut())
-      {
-         throw new VersionException("Node " + parentNode.getPath() + " or its nearest ancestor is checked-in");
-      }
-
-      // Check is locked
-      if (!parentNode.checkLocking())
-      {
-         throw new LockException("Node " + parentNode.getPath() + " is locked ");
-      }
-
       List<ValueData> valueDataList = new ArrayList<ValueData>();
 
       // cast to required type if neccessary

Added: jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1660/readme.txt
===================================================================
--- jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1660/readme.txt	                        (rev 0)
+++ jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1660/readme.txt	2011-11-04 12:20:37 UTC (rev 5165)
@@ -0,0 +1,64 @@
+Summary
+
+    * Status: Problems during testing of Lock operations (EditLockedCommonNodeTest, EditLockedCommonDeepNodeTest)
+    * CCP Issue: N/A. Product Jira Issue: JCR-1660.
+    * Complexity: Low
+
+The Proposal
+Problem description
+
+What is the problem to fix?
+During lock tests (EditLockedCommonNodeTest, EditLockedCommonDeepNodeTest), there are warnings and exceptions. 
+
+Fix description
+
+How is the problem fixed?
+* Check whether the parent node is locked or not.
+* Then try to check whether the property exists or not.
+
+Patch file: JCR-1660.patch
+
+Tests to perform
+
+Reproduction test
+  * Weekly tests (EditLockedCommonNodeTest, EditLockedCommonDeepNodeTest)
+
+Tests performed at DevLevel
+  * functional testing jcr-core project
+
+Tests performed at QA/Support Level
+*
+
+Documentation changes
+
+Documentation changes:
+  * No
+
+Configuration changes
+
+Configuration changes:
+  * No
+
+Will previous configuration continue to work?
+  * Yes
+
+Risks and impacts
+
+Can this bug fix have any side effects on current client projects?
+
+    * No
+
+Is there a performance risk/cost?
+  * No
+
+Validation (PM/Support/QA)
+
+PM Comment
+* PM validated
+
+Support Comment
+* Support validated
+
+QA Feedbacks
+*
+