jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r718208 - in /jackrabbit/branches/1.5: ./ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java
Date Mon, 17 Nov 2008 09:19:49 GMT
Author: jukka
Date: Mon Nov 17 01:19:48 2008
New Revision: 718208

URL: http://svn.apache.org/viewvc?rev=718208&view=rev
Log:
1.5: Merged revision 711843 (JCR-1729). Ignored revisions 711841 and 711842.

Modified:
    jackrabbit/branches/1.5/   (props changed)
    jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java

Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 17 01:19:48 2008
@@ -1,2 +1,2 @@
 /jackrabbit/branches/1.3:631261
-/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567
+/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843

Modified: jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java?rev=718208&r1=718207&r2=718208&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java
(original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java
Mon Nov 17 01:19:48 2008
@@ -104,6 +104,9 @@
             assertFalse(tn.internalIsCheckedOut());
         } finally {
             readOnly.logout();
+            // reset the denied read-access
+            n.checkout();
+            changeReadPermission(principal, n, true);
         }
     }
 }
\ No newline at end of file



Mime
View raw message