jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1851077 - in /jackrabbit/branches/2.8: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetPredecessorsTest.java
Date Fri, 11 Jan 2019 16:30:24 GMT
Author: reschke
Date: Fri Jan 11 16:30:23 2019
New Revision: 1851077

URL: http://svn.apache.org/viewvc?rev=1851077&view=rev
Log:
JCR-4324: NPE on Version.getLinearPredecessor() implementation (ported to 2.8)

Modified:
    jackrabbit/branches/2.8/   (props changed)
    jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java
    jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetPredecessorsTest.java

Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 11 16:30:23 2019
@@ -2,4 +2,4 @@
 /jackrabbit/branches/2.14:1813154
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1667795,1674859,1680757,1709811,1717599,1720093,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1776384-1776385,1776407,1776413,1779166,1779460,1780208,1780335-1780336,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1817201,1818586,1819269,1820133,1821597,1822863,1822947,1822950,1826230,1826647,1826940,1826964,1830540,1830753,1831854,1833374
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1667795,1674859,1680757,1709811,1717599,1720093,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1776384-1776385,1776407,1776413,1779166,1779460,1780208,1780335-1780336,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1817201,1818586,1819269,1820133,1821597,1822863,1822947,1822950,1826230,1826647,1826940,1826964,1830540,1830753,1831854,1833374,1834424

Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java?rev=1851077&r1=1851076&r2=1851077&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java
(original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java
Fri Jan 11 16:30:23 2019
@@ -127,7 +127,7 @@ public class VersionImpl extends NodeImp
      */
     public javax.jcr.version.Version getLinearPredecessor() throws RepositoryException {
         InternalVersion pred = getInternalVersion().getLinearPredecessor();
-        return (Version) sessionContext.getSessionImpl().getNodeById(pred.getId());
+        return pred == null ? null : (Version) sessionContext.getSessionImpl().getNodeById(pred.getId());
     }
 
     /**

Modified: jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetPredecessorsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetPredecessorsTest.java?rev=1851077&r1=1851076&r2=1851077&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetPredecessorsTest.java
(original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetPredecessorsTest.java
Fri Jan 11 16:30:23 2019
@@ -45,31 +45,34 @@ public class GetPredecessorsTest extends
 
         assertTrue("Version should have at minimum one predecessor version.", version.getPredecessors().length
> 0);
     }
-    
+
     /**
-     * Checks ontaining the linear predecessor.
+     * Checks obtaining the linear predecessor.
      * @since JCR 2.0
      */
     public void testGetLinearPredecessorSuccessor() throws RepositoryException {
 
         String path = versionableNode.getPath();
-        
+
         VersionManager vm = versionableNode.getSession().getWorkspace().getVersionManager();
-        
+
         // get the previous version
         Version pred = vm.getBaseVersion(path);
 
+        // shouldn't have a predecessor
+        assertNull(pred.getLinearPredecessor());
+
         // shouldn't have a successor yet
         assertNull(pred.getLinearSuccessor());
-        
+
         // check root version
         Version root = vm.getVersionHistory(path).getRootVersion();
         assertNull(root.getLinearSuccessor());
-        
+
         // create a new version
         vm.checkout(path);
         Version version = vm.checkin(path);
-        
+
         // refresh the predecessor
         pred = (Version)versionableNode.getSession().getNode(pred.getPath());
 



Mime
View raw message