You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/09/04 13:51:26 UTC
svn commit: r1701224 [1/2] - in /jackrabbit/oak/branches/1.0: ./
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/ oak-jcr/...
Author: reschke
Date: Fri Sep 4 11:51:25 2015
New Revision: 1701224
URL: http://svn.apache.org/r1701224
Log:
OAK-2712: Possible null-dereference when calling ItemImpl#perform (ported to 1.0)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/AccessManager.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/operation/SessionOperation.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 4 11:51:25 2015
@@ -1,3 +1,3 @@
-/jackrabbit/oak/branches/1.2:1695500
+/jackrabbit/oak/branches/1.2:1695500,1700753
/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1594987,1595147,1595186,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609
064,1609081,1609165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1
627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633327,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635178,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,1641350,164135
2,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646687,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,165
6303,1656394,1656400,1656425,1656427,1656432,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1661988,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1663927,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,
1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,1685023,16850
75,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700727,1700749,1700769,1700775
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java Fri Sep 4 11:51:25 2015
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.jcr.delegate;
+import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
@@ -45,6 +46,7 @@ public class AccessControlManagerDelegat
@Override
public Privilege[] getSupportedPrivileges(final String absPath) throws RepositoryException {
return delegate.perform(new SessionOperation<Privilege[]>("getSupportedPrivileges") {
+ @Nonnull
@Override
public Privilege[] perform() throws RepositoryException {
return acManager.getSupportedPrivileges(absPath);
@@ -55,6 +57,7 @@ public class AccessControlManagerDelegat
@Override
public Privilege privilegeFromName(final String privilegeName) throws RepositoryException {
return delegate.perform(new SessionOperation<Privilege>("privilegeFromName") {
+ @Nonnull
@Override
public Privilege perform() throws RepositoryException {
return acManager.privilegeFromName(privilegeName);
@@ -66,6 +69,7 @@ public class AccessControlManagerDelegat
public boolean hasPrivileges(final String absPath, final Privilege[] privileges)
throws RepositoryException {
return delegate.perform(new SessionOperation<Boolean>("hasPrivileges") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return acManager.hasPrivileges(absPath, privileges);
@@ -76,6 +80,7 @@ public class AccessControlManagerDelegat
@Override
public Privilege[] getPrivileges(final String absPath) throws RepositoryException {
return delegate.perform(new SessionOperation<Privilege[]>("getPrivileges") {
+ @Nonnull
@Override
public Privilege[] perform() throws RepositoryException {
return acManager.getPrivileges(absPath);
@@ -86,6 +91,7 @@ public class AccessControlManagerDelegat
@Override
public AccessControlPolicy[] getPolicies(final String absPath) throws RepositoryException {
return delegate.perform(new SessionOperation<AccessControlPolicy[]>("getPolicies") {
+ @Nonnull
@Override
public AccessControlPolicy[] perform() throws RepositoryException {
return acManager.getPolicies(absPath);
@@ -97,6 +103,7 @@ public class AccessControlManagerDelegat
public AccessControlPolicy[] getEffectivePolicies(final String absPath)
throws RepositoryException {
return delegate.perform(new SessionOperation<AccessControlPolicy[]>("getEffectivePolicies") {
+ @Nonnull
@Override
public AccessControlPolicy[] perform() throws RepositoryException {
return acManager.getEffectivePolicies(absPath);
@@ -108,6 +115,7 @@ public class AccessControlManagerDelegat
public AccessControlPolicyIterator getApplicablePolicies(final String absPath)
throws RepositoryException {
return delegate.perform(new SessionOperation<AccessControlPolicyIterator>("getApplicablePolicies") {
+ @Nonnull
@Override
public AccessControlPolicyIterator perform() throws RepositoryException {
return acManager.getApplicablePolicies(absPath);
@@ -118,11 +126,10 @@ public class AccessControlManagerDelegat
@Override
public void setPolicy(final String absPath, final AccessControlPolicy policy)
throws RepositoryException {
- delegate.perform(new SessionOperation<Void>("setPolicy") {
+ delegate.performVoid(new SessionOperation("setPolicy") {
@Override
- public Void perform() throws RepositoryException {
+ public void performVoid() throws RepositoryException {
acManager.setPolicy(absPath, policy);
- return null;
}
});
}
@@ -130,11 +137,10 @@ public class AccessControlManagerDelegat
@Override
public void removePolicy(final String absPath, final AccessControlPolicy policy)
throws RepositoryException {
- delegate.perform(new SessionOperation<Void>("removePolicy") {
+ delegate.performVoid(new SessionOperation("removePolicy") {
@Override
- public Void perform() throws RepositoryException {
+ public void performVoid() throws RepositoryException {
acManager.removePolicy(absPath, policy);
- return null;
}
});
}
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java Fri Sep 4 11:51:25 2015
@@ -73,6 +73,7 @@ abstract class AuthorizableDelegator imp
@Override
public boolean isGroup() {
return sessionDelegate.safePerform(new SessionOperation<Boolean>("isGroup") {
+ @Nonnull
@Override
public Boolean perform() {
return delegate.isGroup();
@@ -83,6 +84,7 @@ abstract class AuthorizableDelegator imp
@Override
public String getID() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<String>("getID") {
+ @Nonnull
@Override
public String perform() throws RepositoryException {
return delegate.getID();
@@ -95,6 +97,7 @@ abstract class AuthorizableDelegator imp
@Override
public Principal getPrincipal() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Principal>("getPrincipal") {
+ @Nonnull
@Override
public Principal perform() throws RepositoryException {
return delegate.getPrincipal();
@@ -105,6 +108,7 @@ abstract class AuthorizableDelegator imp
@Override
public Iterator<Group> declaredMemberOf() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Iterator<Group>>("declaredMemberOf") {
+ @Nonnull
@Override
public Iterator<Group> perform() throws RepositoryException {
Iterator<Group> groups = delegate.declaredMemberOf();
@@ -122,6 +126,7 @@ abstract class AuthorizableDelegator imp
@Override
public Iterator<Group> memberOf() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Iterator<Group>>("memberOf") {
+ @Nonnull
@Override
public Iterator<Group> perform() throws RepositoryException {
Iterator<Group> groups = delegate.memberOf();
@@ -138,11 +143,10 @@ abstract class AuthorizableDelegator imp
@Override
public void remove() throws RepositoryException {
- sessionDelegate.perform(new SessionOperation<Void>("remove") {
+ sessionDelegate.performVoid(new SessionOperation("remove") {
@Override
- public Void perform() throws RepositoryException {
+ public void performVoid() throws RepositoryException {
delegate.remove();
- return null;
}
});
}
@@ -150,6 +154,7 @@ abstract class AuthorizableDelegator imp
@Override
public Iterator<String> getPropertyNames() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Iterator<String>>("getPropertyNames") {
+ @Nonnull
@Override
public Iterator<String> perform() throws RepositoryException {
return delegate.getPropertyNames();
@@ -160,6 +165,7 @@ abstract class AuthorizableDelegator imp
@Override
public Iterator<String> getPropertyNames(final String relPath) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Iterator<String>>("getPropertyNames") {
+ @Nonnull
@Override
public Iterator<String> perform() throws RepositoryException {
return delegate.getPropertyNames(relPath);
@@ -170,6 +176,7 @@ abstract class AuthorizableDelegator imp
@Override
public boolean hasProperty(final String relPath) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("hasProperty") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return delegate.hasProperty(relPath);
@@ -179,22 +186,20 @@ abstract class AuthorizableDelegator imp
@Override
public void setProperty(final String relPath, final Value value) throws RepositoryException {
- sessionDelegate.perform(new SessionOperation<Void>("setProperty") {
+ sessionDelegate.performVoid(new SessionOperation("setProperty") {
@Override
- public Void perform() throws RepositoryException {
+ public void performVoid() throws RepositoryException {
delegate.setProperty(relPath, value);
- return null;
}
});
}
@Override
public void setProperty(final String relPath, final Value[] value) throws RepositoryException {
- sessionDelegate.perform(new SessionOperation<Void>("setProperty") {
+ sessionDelegate.performVoid(new SessionOperation("setProperty") {
@Override
- public Void perform() throws RepositoryException {
+ public void performVoid() throws RepositoryException {
delegate.setProperty(relPath, value);
- return null;
}
});
}
@@ -202,6 +207,7 @@ abstract class AuthorizableDelegator imp
@Override
public Value[] getProperty(final String relPath) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Value[]>("getProperty") {
+ @Nonnull
@Override
public Value[] perform() throws RepositoryException {
return delegate.getProperty(relPath);
@@ -212,6 +218,7 @@ abstract class AuthorizableDelegator imp
@Override
public boolean removeProperty(final String relPath) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("removeProperty") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return delegate.removeProperty(relPath);
@@ -222,6 +229,7 @@ abstract class AuthorizableDelegator imp
@Override
public String getPath() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<String>("getPath") {
+ @Nonnull
@Override
public String perform() throws RepositoryException {
return delegate.getPath();
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/GroupDelegator.java Fri Sep 4 11:51:25 2015
@@ -67,6 +67,7 @@ final class GroupDelegator extends Autho
@Override
public Iterator<Authorizable> getDeclaredMembers() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Iterator<Authorizable>>("getDeclaredMembers") {
+ @Nonnull
@Override
public Iterator<Authorizable> perform() throws RepositoryException {
Iterator<Authorizable> authorizables = getDelegate().getDeclaredMembers();
@@ -84,6 +85,7 @@ final class GroupDelegator extends Autho
@Override
public Iterator<Authorizable> getMembers() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Iterator<Authorizable>>("getMembers") {
+ @Nonnull
@Override
public Iterator<Authorizable> perform() throws RepositoryException {
Iterator<Authorizable> authorizables = getDelegate().getMembers();
@@ -101,6 +103,7 @@ final class GroupDelegator extends Autho
@Override
public boolean isDeclaredMember(final Authorizable authorizable) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("isDeclaredMember") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return getDelegate().isDeclaredMember(unwrap(authorizable));
@@ -111,6 +114,7 @@ final class GroupDelegator extends Autho
@Override
public boolean isMember(final Authorizable authorizable) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("isMember") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return getDelegate().isMember(unwrap(authorizable));
@@ -121,6 +125,7 @@ final class GroupDelegator extends Autho
@Override
public boolean addMember(final Authorizable authorizable) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("addMember") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return getDelegate().addMember(unwrap(authorizable));
@@ -131,6 +136,7 @@ final class GroupDelegator extends Autho
@Override
public boolean removeMember(final Authorizable authorizable) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("removeMember") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return getDelegate().removeMember(unwrap(authorizable));
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ImpersonationDelegator.java Fri Sep 4 11:51:25 2015
@@ -23,6 +23,7 @@ import static com.google.common.base.Pre
import java.security.Principal;
+import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.security.auth.Subject;
@@ -57,6 +58,7 @@ final class ImpersonationDelegator imple
@Override
public PrincipalIterator getImpersonators() throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<PrincipalIterator>("getImpersonators") {
+ @Nonnull
@Override
public PrincipalIterator perform() throws RepositoryException {
return impersonationDelegate.getImpersonators();
@@ -67,6 +69,7 @@ final class ImpersonationDelegator imple
@Override
public boolean grantImpersonation(final Principal principal) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("grantImpersonation") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return impersonationDelegate.grantImpersonation(principal);
@@ -77,6 +80,7 @@ final class ImpersonationDelegator imple
@Override
public boolean revokeImpersonation(final Principal principal) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("revokeImpersonation") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return impersonationDelegate.revokeImpersonation(principal);
@@ -87,6 +91,7 @@ final class ImpersonationDelegator imple
@Override
public boolean allows(final Subject subject) throws RepositoryException {
return sessionDelegate.perform(new SessionOperation<Boolean>("allows") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return impersonationDelegate.allows(subject);
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/JackrabbitAccessControlManagerDelegator.java Fri Sep 4 11:51:25 2015
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.oak.jcr.de
import java.security.Principal;
import java.util.Set;
+import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.AccessControlPolicyIterator;
@@ -52,8 +53,8 @@ public class JackrabbitAccessControlMana
@Override
public JackrabbitAccessControlPolicy[] getApplicablePolicies(final Principal principal)
throws RepositoryException {
- return delegate.perform(
- new SessionOperation<JackrabbitAccessControlPolicy[]>("getApplicablePolicies") {
+ return delegate.perform(new SessionOperation<JackrabbitAccessControlPolicy[]>("getApplicablePolicies") {
+ @Nonnull
@Override
public JackrabbitAccessControlPolicy[] perform() throws RepositoryException {
return jackrabbitACManager.getApplicablePolicies(principal);
@@ -64,8 +65,8 @@ public class JackrabbitAccessControlMana
@Override
public JackrabbitAccessControlPolicy[] getPolicies(final Principal principal)
throws RepositoryException {
- return delegate.perform(
- new SessionOperation<JackrabbitAccessControlPolicy[]>("getPolicies") {
+ return delegate.perform(new SessionOperation<JackrabbitAccessControlPolicy[]>("getPolicies") {
+ @Nonnull
@Override
public JackrabbitAccessControlPolicy[] perform() throws RepositoryException {
return jackrabbitACManager.getPolicies(principal);
@@ -76,8 +77,8 @@ public class JackrabbitAccessControlMana
@Override
public AccessControlPolicy[] getEffectivePolicies(final Set<Principal> principals)
throws RepositoryException {
- return delegate.perform(
- new SessionOperation<AccessControlPolicy[]>("getEffectivePolicies") {
+ return delegate.perform(new SessionOperation<AccessControlPolicy[]>("getEffectivePolicies") {
+ @Nonnull
@Override
public AccessControlPolicy[] perform() throws RepositoryException {
return jackrabbitACManager.getEffectivePolicies(principals);
@@ -88,8 +89,8 @@ public class JackrabbitAccessControlMana
@Override
public boolean hasPrivileges(final String absPath, final Set<Principal> principals,
final Privilege[] privileges) throws RepositoryException {
- return delegate.perform(
- new SessionOperation<Boolean>("hasPrivileges") {
+ return delegate.perform(new SessionOperation<Boolean>("hasPrivileges") {
+ @Nonnull
@Override
public Boolean perform() throws RepositoryException {
return jackrabbitACManager.hasPrivileges(absPath, principals, privileges);
@@ -100,8 +101,8 @@ public class JackrabbitAccessControlMana
@Override
public Privilege[] getPrivileges(final String absPath, final Set<Principal> principals)
throws RepositoryException {
- return delegate.perform(
- new SessionOperation<Privilege[]>("getPrivileges") {
+ return delegate.perform(new SessionOperation<Privilege[]>("getPrivileges") {
+ @Nonnull
@Override
public Privilege[] perform() throws RepositoryException {
return jackrabbitACManager.getPrivileges(absPath, principals);
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java Fri Sep 4 11:51:25 2015
@@ -724,6 +724,7 @@ public class NodeDelegate extends ItemDe
return getLock() != null;
}
+ @CheckForNull
public NodeDelegate getLock() {
Tree lock = findLock(tree, false);
if (lock != null) {
@@ -739,7 +740,8 @@ public class NodeDelegate extends ItemDe
return null;
}
- private Tree findLock(Tree tree, boolean deep) {
+ @CheckForNull
+ private Tree findLock(@Nonnull Tree tree, boolean deep) {
if (holdsLock(tree, deep)) {
return tree;
} else if (tree.isRoot()) {
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java Fri Sep 4 11:51:25 2015
@@ -21,6 +21,9 @@ package org.apache.jackrabbit.oak.jcr.de
import java.security.Principal;
+import javax.annotation.Nonnull;
+import javax.jcr.RepositoryException;
+
import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation;
@@ -44,6 +47,7 @@ public class PrincipalManagerDelegator i
@Override
public boolean hasPrincipal(final String principalName) {
return delegate.safePerform(new SessionOperation<Boolean>("hasPrincipal") {
+ @Nonnull
@Override
public Boolean perform() {
return principalManager.hasPrincipal(principalName);
@@ -53,17 +57,22 @@ public class PrincipalManagerDelegator i
@Override
public Principal getPrincipal(final String principalName) {
- return delegate.safePerform(new SessionOperation<Principal>("getPrincipal") {
- @Override
- public Principal perform() {
- return principalManager.getPrincipal(principalName);
- }
- });
+ try {
+ return delegate.performNullable(new SessionOperation<Principal>("getPrincipal") {
+ @Override
+ public Principal performNullable() {
+ return principalManager.getPrincipal(principalName);
+ }
+ });
+ } catch (RepositoryException e) {
+ throw new RuntimeException("Unexpected exception thrown by operation 'getPrincipal'", e);
+ }
}
@Override
public PrincipalIterator findPrincipals(final String simpleFilter) {
return delegate.safePerform(new SessionOperation<PrincipalIterator>("findPrincipals") {
+ @Nonnull
@Override
public PrincipalIterator perform() {
return principalManager.findPrincipals(simpleFilter);
@@ -74,6 +83,7 @@ public class PrincipalManagerDelegator i
@Override
public PrincipalIterator findPrincipals(final String simpleFilter, final int searchType) {
return delegate.safePerform(new SessionOperation<PrincipalIterator>("findPrincipals") {
+ @Nonnull
@Override
public PrincipalIterator perform() {
return principalManager.findPrincipals(simpleFilter, searchType);
@@ -84,6 +94,7 @@ public class PrincipalManagerDelegator i
@Override
public PrincipalIterator getPrincipals(final int searchType) {
return delegate.safePerform(new SessionOperation<PrincipalIterator>("getPrincipals") {
+ @Nonnull
@Override
public PrincipalIterator perform() {
return principalManager.getPrincipals(searchType);
@@ -94,6 +105,7 @@ public class PrincipalManagerDelegator i
@Override
public PrincipalIterator getGroupMembership(final Principal principal) {
return delegate.safePerform(new SessionOperation<PrincipalIterator>("getGroupMembership") {
+ @Nonnull
@Override
public PrincipalIterator perform() {
return principalManager.getGroupMembership(principal);
@@ -104,6 +116,7 @@ public class PrincipalManagerDelegator i
@Override
public Principal getEveryone() {
return delegate.safePerform(new SessionOperation<Principal>("getEveryone") {
+ @Nonnull
@Override
public Principal perform() {
return principalManager.getEveryone();
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrivilegeManagerDelegator.java Fri Sep 4 11:51:25 2015
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.jcr.delegate;
+import javax.annotation.Nonnull;
import javax.jcr.AccessDeniedException;
import javax.jcr.NamespaceException;
import javax.jcr.RepositoryException;
@@ -46,6 +47,7 @@ public class PrivilegeManagerDelegator i
@Override
public Privilege[] getRegisteredPrivileges() throws RepositoryException {
return delegate.perform(new SessionOperation<Privilege[]>("getRegisteredPrivileges") {
+ @Nonnull
@Override
public Privilege[] perform() throws RepositoryException {
return pm.getRegisteredPrivileges();
@@ -56,6 +58,7 @@ public class PrivilegeManagerDelegator i
@Override
public Privilege getPrivilege(final String privilegeName) throws AccessControlException, RepositoryException {
return delegate.perform(new SessionOperation<Privilege>("getPrivilege") {
+ @Nonnull
@Override
public Privilege perform() throws RepositoryException {
return pm.getPrivilege(privilegeName);
@@ -66,6 +69,7 @@ public class PrivilegeManagerDelegator i
@Override
public Privilege registerPrivilege(final String privilegeName, final boolean isAbstract, final String[] declaredAggregateNames) throws AccessDeniedException, NamespaceException, RepositoryException {
return delegate.perform(new SessionOperation<Privilege>("registerPrivilege") {
+ @Nonnull
@Override
public Privilege perform() throws RepositoryException {
return pm.registerPrivilege(privilegeName, isAbstract, declaredAggregateNames);
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java Fri Sep 4 11:51:25 2015
@@ -36,6 +36,7 @@ import java.util.concurrent.locks.Reentr
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.jcr.ItemExistsException;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -186,8 +187,8 @@ public class SessionDelegate {
* @throws RepositoryException
* @see #getRoot()
*/
- public <T> T perform(SessionOperation<T> sessionOperation)
- throws RepositoryException {
+ @Nonnull
+ public <T> T perform(@Nonnull SessionOperation<T> sessionOperation) throws RepositoryException {
long t0 = clock.getTime();
// Acquire the exclusive lock for accessing session internals.
@@ -195,51 +196,79 @@ public class SessionDelegate {
// message to let the user know of such cases.
lock.lock(sessionOperation);
try {
- if (sessionOpCount == 0) {
- // Refresh and precondition checks only for non re-entrant
- // session operations. Don't refresh if this operation is a
- // refresh operation itself or a save operation, which does an
- // implicit refresh, or logout for obvious reasons.
- if (!sessionOperation.isRefresh()
- && !sessionOperation.isSave()
- && !sessionOperation.isLogout()
- && refreshStrategy.needsRefresh(
- SECONDS.convert(t0 - sessionCounters.accessTime, MILLISECONDS))) {
- refresh(true);
- refreshStrategy.refreshed();
- updateCount++;
- }
- sessionOperation.checkPreconditions();
- }
+ prePerform(sessionOperation, t0);
try {
sessionOpCount++;
T result = sessionOperation.perform();
logOperationDetails(contentSession, sessionOperation);
return result;
} finally {
- sessionCounters.accessTime = t0;
- long dt = NANOSECONDS.convert(clock.getTime() - t0, MILLISECONDS);
- sessionOpCount--;
- if (sessionOperation.isUpdate()) {
- sessionCounters.writeTime = t0;
- sessionCounters.writeCount++;
- writeCounter.incrementAndGet();
- writeDuration.addAndGet(dt);
- updateCount++;
- } else {
- sessionCounters.readTime = t0;
- sessionCounters.readCount++;
- readCounter.incrementAndGet();
- readDuration.addAndGet(dt);
- }
- if (sessionOperation.isSave()) {
- refreshAtNextAccess.refreshAtNextAccess(false);
- // Force refreshing on access through other sessions on the same thread
- saveCountRefresh.forceRefresh();
- } else if (sessionOperation.isRefresh()) {
- refreshAtNextAccess.refreshAtNextAccess(false);
- saveCountRefresh.refreshed();
- }
+ postPerform(sessionOperation, t0);
+ }
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ /**
+ * Same as {@link #perform(org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation)}
+ * but with the option to return {@code null}; thus calling
+ * {@link org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation#performNullable()}
+ *
+ * @param sessionOperation the {@code SessionOperation} to perform
+ * @param <T> return type of {@code sessionOperation}
+ * @return the result of {@code sessionOperation.performNullable()}, which
+ * might also be {@code null}.
+ * @throws RepositoryException
+ * @see #perform(org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation)
+ */
+ @Nullable
+ public <T> T performNullable(@Nonnull SessionOperation<T> sessionOperation) throws RepositoryException {
+ long t0 = clock.getTime();
+
+ // Acquire the exclusive lock for accessing session internals.
+ // No other session should be holding the lock, so we log a
+ // message to let the user know of such cases.
+ lock.lock(sessionOperation);
+ try {
+ prePerform(sessionOperation, t0);
+ try {
+ sessionOpCount++;
+ T result = sessionOperation.performNullable();
+ logOperationDetails(contentSession, sessionOperation);
+ return result;
+ } finally {
+ postPerform(sessionOperation, t0);
+ }
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ /**
+ * Same as {@link #perform(org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation)}
+ * for calls that don't expect any return value; thus calling
+ * {@link org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation#performVoid()}.
+ *
+ * @param sessionOperation the {@code SessionOperation} to perform.
+ * @throws RepositoryException
+ * @see #perform(org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation)
+ */
+ public void performVoid(SessionOperation<Void> sessionOperation) throws RepositoryException {
+ long t0 = clock.getTime();
+
+ // Acquire the exclusive lock for accessing session internals.
+ // No other session should be holding the lock, so we log a
+ // message to let the user know of such cases.
+ lock.lock(sessionOperation);
+ try {
+ prePerform(sessionOperation, t0);
+ try {
+ sessionOpCount++;
+ sessionOperation.performVoid();
+ logOperationDetails(contentSession, sessionOperation);
+ } finally {
+ postPerform(sessionOperation, t0);
}
} finally {
lock.unlock();
@@ -261,8 +290,7 @@ public class SessionDelegate {
try {
return perform(sessionOperation);
} catch (RepositoryException e) {
- throw new RuntimeException("Unexpected exception thrown by operation " +
- sessionOperation, e);
+ throw new RuntimeException("Unexpected exception thrown by operation " + sessionOperation, e);
}
}
@@ -564,7 +592,49 @@ public class SessionDelegate {
return contentSession.toString();
}
- //------------------------------------------------------------< internal >---
+ //-----------------------------------------------------------< internal >---
+ private void prePerform(@Nonnull SessionOperation<?> op, long t0) throws RepositoryException {
+ if (sessionOpCount == 0) {
+ // Refresh and precondition checks only for non re-entrant
+ // session operations. Don't refresh if this operation is a
+ // refresh operation itself or a save operation, which does an
+ // implicit refresh, or logout for obvious reasons.
+ if (!op.isRefresh() && !op.isSave() && !op.isLogout() &&
+ refreshStrategy.needsRefresh(SECONDS.convert(t0 - sessionCounters.accessTime, MILLISECONDS))) {
+ refresh(true);
+ refreshStrategy.refreshed();
+ updateCount++;
+ }
+ op.checkPreconditions();
+ }
+ }
+
+ private void postPerform(@Nonnull SessionOperation<?> op, long t0) {
+ sessionCounters.accessTime = t0;
+ long dt = NANOSECONDS.convert(clock.getTime() - t0, MILLISECONDS);
+ sessionOpCount--;
+ if (op.isUpdate()) {
+ sessionCounters.writeTime = t0;
+ sessionCounters.writeCount++;
+ writeCounter.incrementAndGet();
+ writeDuration.addAndGet(dt);
+ updateCount++;
+ } else {
+ sessionCounters.readTime = t0;
+ sessionCounters.readCount++;
+ readCounter.incrementAndGet();
+ readDuration.addAndGet(dt);
+ }
+ if (op.isSave()) {
+ refreshAtNextAccess.refreshAtNextAccess(false);
+ // Force refreshing on access through other sessions on the same thread
+ saveCountRefresh.forceRefresh();
+ } else if (op.isRefresh()) {
+ refreshAtNextAccess.refreshAtNextAccess(false);
+ saveCountRefresh.refreshed();
+ }
+ }
+
private static <T> void logOperationDetails(ContentSession session, SessionOperation<T> ops) {
if (readOperationLogger.isTraceEnabled()
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java Fri Sep 4 11:51:25 2015
@@ -18,13 +18,14 @@ package org.apache.jackrabbit.oak.jcr.lo
import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.lock.Lock;
import javax.jcr.lock.LockException;
+import org.apache.jackrabbit.oak.jcr.delegate.SessionDelegate;
import org.apache.jackrabbit.oak.jcr.session.NodeImpl;
import org.apache.jackrabbit.oak.jcr.session.SessionContext;
import org.apache.jackrabbit.oak.jcr.delegate.NodeDelegate;
@@ -37,8 +38,7 @@ public final class LockImpl implements L
private final NodeDelegate delegate;
- public LockImpl(
- @Nonnull SessionContext context, @Nonnull NodeDelegate delegate) {
+ public LockImpl(@Nonnull SessionContext context, @Nonnull NodeDelegate delegate) {
this.context = checkNotNull(context);
this.delegate = checkNotNull(delegate);
}
@@ -54,9 +54,9 @@ public final class LockImpl implements L
@Override
public String getLockOwner() {
- return safePerform(new NodeOperation<String>(delegate, "getLockOwner") {
+ return savePerformNullable(new NodeOperation<String>(delegate, "getLockOwner") {
@Override
- public String perform() {
+ public String performNullable() {
return node.getLockOwner();
}
});
@@ -64,7 +64,8 @@ public final class LockImpl implements L
@Override
public boolean isDeep() {
- return safePerform(new NodeOperation<Boolean>(delegate, "isDeep") {
+ return getSessionDelegate().safePerform(new NodeOperation<Boolean>(delegate, "isDeep") {
+ @Nonnull
@Override
public Boolean perform() {
return node.holdsLock(true);
@@ -74,8 +75,9 @@ public final class LockImpl implements L
@Override
public boolean isLive() {
- return context.getSession().isLive() && safePerform(
+ return context.getSession().isLive() && getSessionDelegate().safePerform(
new NodeOperation<Boolean>(delegate, "isLive") {
+ @Nonnull
@Override
public Boolean perform() {
return node.holdsLock(false);
@@ -86,9 +88,9 @@ public final class LockImpl implements L
@Override
public String getLockToken() {
- return safePerform(new NodeOperation<String>(delegate, "getLockToken") {
+ return savePerformNullable(new NodeOperation<String>(delegate, "getLockToken") {
@Override
- public String perform() {
+ public String performNullable() {
String token = node.getPath();
if (context.getOpenScopedLocks().contains(token)) {
return token;
@@ -123,7 +125,8 @@ public final class LockImpl implements L
@Override
public boolean isSessionScoped() {
- return safePerform(new NodeOperation<Boolean>(delegate, "isSessionScoped") {
+ return getSessionDelegate().safePerform(new NodeOperation<Boolean>(delegate, "isSessionScoped") {
+ @Nonnull
@Override
public Boolean perform() {
String path = node.getPath();
@@ -134,7 +137,8 @@ public final class LockImpl implements L
@Override
public boolean isLockOwningSession() {
- return safePerform(new NodeOperation<Boolean>(delegate, "isLockOwningSessions") {
+ return getSessionDelegate().safePerform(new NodeOperation<Boolean>(delegate, "isLockOwningSessions") {
+ @Nonnull
@Override
public Boolean perform() {
String path = node.getPath();
@@ -153,18 +157,16 @@ public final class LockImpl implements L
//-----------------------------------------------------------< private >--
- /**
- * Perform the passed {@link SessionOperation} assuming it does not
- * throw a {@code RepositoryException}. If it does, wrap it into and
- * throw it as a {@code RuntimeException}.
- *
- * @param op operation to perform
- * @param <U> return type of the operation
- * @return the result of {@code op.perform()}
- */
- @CheckForNull
- private final <U> U safePerform(@Nonnull SessionOperation<U> op) {
- return context.getSessionDelegate().safePerform(op);
+ private SessionDelegate getSessionDelegate() {
+ return context.getSessionDelegate();
}
+ @Nullable
+ private <U> U savePerformNullable(@Nonnull SessionOperation<U> op) {
+ try {
+ return context.getSessionDelegate().performNullable(op);
+ } catch (RepositoryException e) {
+ throw new RuntimeException("Unexpected exception thrown by operation " + op, e);
+ }
+ }
}
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java Fri Sep 4 11:51:25 2015
@@ -54,10 +54,12 @@ public class LockManagerImpl implements
this.delegate = sessionContext.getSessionDelegate();
}
- @Override @Nonnull
+ @Nonnull
+ @Override
public String[] getLockTokens() throws RepositoryException {
- return perform(new SessionOperation<String[]>("getLockTokens") {
- @Override @Nonnull
+ return delegate.perform(new SessionOperation<String[]>("getLockTokens") {
+ @Nonnull
+ @Override
public String[] perform() {
Set<String> tokens = sessionContext.getOpenScopedLocks();
return tokens.toArray(new String[tokens.size()]);
@@ -69,17 +71,14 @@ public class LockManagerImpl implements
public void addLockToken(final String lockToken)
throws RepositoryException {
try {
- perform(new LockOperation<String>(sessionContext, lockToken, "addLockToken") {
+ delegate.performVoid(new LockOperation(sessionContext, lockToken, "addLockToken") {
@Override
- protected String perform(NodeDelegate node)
- throws LockException {
+ protected void performVoid(@Nonnull NodeDelegate node) throws LockException {
if (node.holdsLock(false)) { // TODO: check ownership?
String token = node.getPath();
sessionContext.getOpenScopedLocks().add(token);
- return null;
} else {
- throw new LockException(
- "Invalid lock token: " + lockToken);
+ throw new LockException("Invalid lock token: " + lockToken);
}
}
});
@@ -89,25 +88,25 @@ public class LockManagerImpl implements
}
@Override
- public void removeLockToken(final String lockToken)
- throws RepositoryException {
- if (!perform(new SessionOperation<Boolean>("removeLockToken") {
- @Override @Nonnull
+ public void removeLockToken(final String lockToken) throws RepositoryException {
+ if (!delegate.perform(new SessionOperation<Boolean>("removeLockToken") {
+ @Nonnull
+ @Override
public Boolean perform() {
// TODO: name mapping?
return sessionContext.getOpenScopedLocks().remove(lockToken);
}
})) {
- throw new LockException(
- "Lock token " + lockToken + " is not held by this session");
+ throw new LockException("Lock token " + lockToken + " is not held by this session");
}
}
@Override
public boolean isLocked(String absPath) throws RepositoryException {
- return perform(new LockOperation<Boolean>(sessionContext, absPath, "isLocked") {
+ return delegate.perform(new LockOperation<Boolean>(sessionContext, absPath, "isLocked") {
+ @Nonnull
@Override
- protected Boolean perform(NodeDelegate node) {
+ protected Boolean perform(@Nonnull NodeDelegate node) {
return node.isLocked();
}
});
@@ -115,76 +114,90 @@ public class LockManagerImpl implements
@Override
public boolean holdsLock(String absPath) throws RepositoryException {
- return perform(new LockOperation<Boolean>(sessionContext, absPath, "holdsLock") {
+ return delegate.perform(new LockOperation<Boolean>(sessionContext, absPath, "holdsLock") {
+ @Nonnull
@Override
- protected Boolean perform(NodeDelegate node) {
+ protected Boolean perform(@Nonnull NodeDelegate node) {
return node.holdsLock(false);
}
});
}
- @Override @Nonnull
- public Lock getLock(String absPath) throws RepositoryException {
- NodeDelegate lock = perform(
- new LockOperation<NodeDelegate>(sessionContext, absPath, "getLock") {
- @Override
- protected NodeDelegate perform(NodeDelegate node) {
- return node.getLock();
- }
- });
- if (lock != null) {
- return new LockImpl(sessionContext, lock);
- } else {
- throw new LockException("Node " + absPath + " is not locked");
- }
+ @Nonnull
+ @Override
+ public Lock getLock(final String absPath) throws RepositoryException {
+ NodeDelegate lock = delegate.perform(new LockOperation<NodeDelegate>(sessionContext, absPath, "getLock") {
+ @Nonnull
+ @Override
+ protected NodeDelegate perform(@Nonnull NodeDelegate node) throws LockException {
+ NodeDelegate lock = node.getLock();
+ if (lock == null) {
+ throw new LockException("Node " + absPath + " is not locked");
+ } else {
+ return lock;
+ }
+ }
+ });
+
+ return new LockImpl(sessionContext, lock);
}
- @Override @Nonnull
- public Lock lock(
- String absPath, final boolean isDeep, final boolean isSessionScoped,
- long timeoutHint, String ownerInfo) throws RepositoryException {
- return new LockImpl(sessionContext, perform(
- new LockOperation<NodeDelegate>(sessionContext, absPath, "lock") {
- @Override
- protected NodeDelegate perform(NodeDelegate node)
- throws RepositoryException {
- if (node.getStatus() != Status.UNCHANGED) {
- throw new InvalidItemStateException(
- "Unable to lock a node with pending changes");
- }
- node.lock(isDeep);
- String path = node.getPath();
- if (isSessionScoped) {
- sessionContext.getSessionScopedLocks().add(path);
- } else {
- sessionContext.getOpenScopedLocks().add(path);
- }
- session.refresh(true);
- return node;
- }
- }));
+ @Nonnull
+ @Override
+ public Lock lock(String absPath, final boolean isDeep, final boolean isSessionScoped,
+ long timeoutHint, String ownerInfo) throws RepositoryException {
+ return new LockImpl(sessionContext, delegate.perform(new LockOperation<NodeDelegate>(sessionContext, absPath, "lock") {
+ @Nonnull
+ @Override
+ protected NodeDelegate perform(@Nonnull NodeDelegate node) throws RepositoryException {
+ if (node.getStatus() != Status.UNCHANGED) {
+ throw new InvalidItemStateException(
+ "Unable to lock a node with pending changes");
+ }
+ node.lock(isDeep);
+ String path = node.getPath();
+ if (isSessionScoped) {
+ sessionContext.getSessionScopedLocks().add(path);
+ } else {
+ sessionContext.getOpenScopedLocks().add(path);
+ }
+ session.refresh(true);
+ return node;
+ }
+ }));
}
@Override
public void unlock(String absPath) throws RepositoryException {
- perform(new LockOperation<Void>(sessionContext, absPath, "unlock") {
+ delegate.performVoid(new LockOperation(sessionContext, absPath, "unlock") {
@Override
- protected Void perform(NodeDelegate node)
+ protected void performVoid(@Nonnull NodeDelegate node)
throws RepositoryException {
String path = node.getPath();
- if (canUnlock(node)) {
+ if (canUnlock(path, node)) {
node.unlock();
sessionContext.getSessionScopedLocks().remove(path);
sessionContext.getOpenScopedLocks().remove(path);
session.refresh(true);
- return null;
} else {
throw new LockException("Not an owner of the lock " + path);
}
}
+
+ private boolean canUnlock(String path, NodeDelegate node) {
+ if (sessionContext.getSessionScopedLocks().contains(path)
+ || sessionContext.getOpenScopedLocks().contains(path)) {
+ return true;
+ } else if (sessionContext.getAttributes().get(RELAXED_LOCKING) == TRUE) {
+ String user = sessionContext.getSessionDelegate().getAuthInfo().getUserID();
+ return node.isLockOwner(user) || isAdmin(sessionContext, user);
+ } else {
+ return false;
+ }
+ }
});
}
-
+
/**
* Verifies if the current <tt>sessionContext</tt> can unlock the specified <tt>node</tt>
*
@@ -217,10 +230,4 @@ public class LockManagerImpl implements
}
return false;
}
-
- private <T> T perform(SessionOperation<T> operation)
- throws RepositoryException {
- return delegate.perform(operation);
- }
-
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockOperation.java Fri Sep 4 11:51:25 2015
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.lock;
+import javax.annotation.Nonnull;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -32,24 +33,13 @@ import org.apache.jackrabbit.oak.jcr.ses
public abstract class LockOperation<T> extends SessionOperation<T> {
protected final SessionDelegate session;
-
- private final NodeDelegate node;
-
private final String path;
- protected LockOperation(SessionDelegate session, NodeDelegate node, String name) {
- super(name);
- this.session = session;
- this.path = null;
- this.node = node;
- }
-
protected LockOperation(SessionContext context, String absPath, String name)
throws PathNotFoundException {
super(name);
this.session = context.getSessionDelegate();
this.path = context.getOakPathOrThrowNotFound(absPath);
- this.node = null;
}
@Override
@@ -57,23 +47,38 @@ public abstract class LockOperation<T> e
return true;
}
+ @Nonnull
@Override
public T perform() throws RepositoryException {
session.refresh(true);
+
+ NodeDelegate node = session.getNode(path);
if (node != null) {
return perform(node);
} else {
- NodeDelegate node = session.getNode(path);
- if (node != null) {
- return perform(node);
- } else {
- throw new PathNotFoundException(
- "Node " + path + " not found");
- }
+ throw new PathNotFoundException("Node " + path + " not found");
}
}
- protected abstract T perform(NodeDelegate node)
- throws RepositoryException;
+ @Override
+ public void performVoid() throws RepositoryException {
+ session.refresh(true);
+
+ NodeDelegate node = session.getNode(path);
+ if (node != null) {
+ performVoid(node);
+ } else {
+ throw new PathNotFoundException("Node " + path + " not found");
+ }
+ }
+
+ @Nonnull
+ protected T perform(@Nonnull NodeDelegate node) throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ protected void performVoid(@Nonnull NodeDelegate node) throws RepositoryException {
+ throw new UnsupportedOperationException();
+ }
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryImpl.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryImpl.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryImpl.java Fri Sep 4 11:51:25 2015
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.jcr.qu
import java.util.HashMap;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.jcr.ItemNotFoundException;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
@@ -80,6 +81,7 @@ public class QueryImpl implements Query
}
List<String> names = sessionContext.getSessionDelegate().perform(
new SessionOperation<List<String>>("parse") {
+ @Nonnull
@Override
public List<String> perform() throws RepositoryException {
return manager.parse(statement, language);
@@ -96,6 +98,7 @@ public class QueryImpl implements Query
public QueryResult execute() throws RepositoryException {
return sessionContext.getSessionDelegate().perform(
new SessionOperation<QueryResult>("execute") {
+ @Nonnull
@Override
public QueryResult perform() throws RepositoryException {
return manager.executeQuery(statement, language, limit,
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/AccessManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/AccessManager.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/AccessManager.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/AccessManager.java Fri Sep 4 11:51:25 2015
@@ -42,6 +42,7 @@ public class AccessManager {
public boolean hasPermissions(@Nonnull final String oakPath, @Nonnull final String actions) {
return delegate.safePerform(new SessionOperation<Boolean>("hasPermissions") {
+ @Nonnull
@Override
public Boolean perform() {
return permissionProvider.isGranted(oakPath, actions);
@@ -51,6 +52,7 @@ public class AccessManager {
public boolean hasPermissions(@Nonnull final Tree tree, @Nullable final PropertyState property, final long permissions) throws RepositoryException {
return delegate.safePerform(new SessionOperation<Boolean>("hasPermissions") {
+ @Nonnull
@Override
public Boolean perform() {
return permissionProvider.isGranted(tree, property, permissions);
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java?rev=1701224&r1=1701223&r2=1701224&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java Fri Sep 4 11:51:25 2015
@@ -28,7 +28,6 @@ import static org.apache.jackrabbit.oak.
import java.util.List;
-import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.jcr.AccessDeniedException;
import javax.jcr.InvalidItemStateException;
@@ -108,24 +107,11 @@ abstract class ItemImpl<T extends ItemDe
* @return the result of {@code op.perform()}
* @throws RepositoryException as thrown by {@code op.perform()}.
*/
- @CheckForNull
+ @Nonnull
protected final <U> U perform(@Nonnull SessionOperation<U> op) throws RepositoryException {
return sessionDelegate.perform(op);
}
- /**
- * Perform the passed {@link SessionOperation} assuming it does not throw an
- * {@code RepositoryException}. If it does, wrap it into and throw it as a
- * {@code RuntimeException}.
- * @param op operation to perform
- * @param <U> return type of the operation
- * @return the result of {@code op.perform()}
- */
- @CheckForNull
- protected final <U> U safePerform(@Nonnull SessionOperation<U> op) {
- return sessionDelegate.safePerform(op);
- }
-
//---------------------------------------------------------------< Item >---
/**
@@ -135,6 +121,7 @@ abstract class ItemImpl<T extends ItemDe
@Nonnull
public String getName() throws RepositoryException {
String oakName = perform(new ItemOperation<String>(dlg, "getName") {
+ @Nonnull
@Override
public String perform() {
return item.getName();
@@ -151,6 +138,7 @@ abstract class ItemImpl<T extends ItemDe
@Nonnull
public String getPath() throws RepositoryException {
return toJcrPath(perform(new ItemOperation<String>(dlg, "getPath") {
+ @Nonnull
@Override
public String perform() {
return item.getPath();
@@ -173,6 +161,7 @@ abstract class ItemImpl<T extends ItemDe
}
ItemDelegate ancestor = perform(new ItemOperation<ItemDelegate>(dlg, "getAncestor") {
+ @Nonnull
@Override
public ItemDelegate perform() throws RepositoryException {
String path = item.getPath();
@@ -190,7 +179,12 @@ abstract class ItemImpl<T extends ItemDe
return item;
}
- return sessionDelegate.getNode(path.substring(0, slash));
+ NodeDelegate ndlg = sessionDelegate.getNode(path.substring(0, slash));
+ if (ndlg == null) {
+ throw new ItemNotFoundException(getPath() + "Invalid ancestor depth " + depth);
+ } else {
+ return ndlg;
+ }
}
});
@@ -256,11 +250,10 @@ abstract class ItemImpl<T extends ItemDe
@Override
public void save() throws RepositoryException {
try {
- perform(new ItemWriteOperation<Void>("save") {
+ sessionDelegate.performVoid(new ItemWriteOperation("save") {
@Override
- public Void perform() throws RepositoryException {
+ public void performVoid() throws RepositoryException {
dlg.save();
- return null;
}
@Override
@@ -292,20 +285,21 @@ abstract class ItemImpl<T extends ItemDe
if (!keepChanges) {
log.warn("Item#refresh invokes Session#refresh!");
}
- perform(new SessionOperation<Void>("refresh") {
+ sessionDelegate.performVoid(new SessionOperation("refresh") {
@Override
- public Void perform() throws InvalidItemStateException {
+ public void performVoid() throws InvalidItemStateException {
sessionDelegate.refresh(keepChanges);
if (!dlg.exists()) {
throw new InvalidItemStateException(
"This item no longer exists");
}
- return null;
}
+
@Override
public boolean isUpdate() {
return true;
}
+
@Override
public boolean isRefresh() {
return true;