svn commit: r1847088 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ValidNamesTest.java

[reschke]

Author: reschke
Date: Wed Nov 21 10:44:23 2018
New Revision: 1847088

URL: http://svn.apache.org/viewvc?rev=1847088&view=rev
Log:
OAK-7912: ValidNamesTest: potential NPE in teardown

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ValidNamesTest.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ValidNamesTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ValidNamesTest.java?rev=1847088&r1=1847087&r2=1847088&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ValidNamesTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ValidNamesTest.java
 Wed Nov 21 10:44:23 2018
@@ -47,6 +47,8 @@ public class ValidNamesTest extends Abst
     private static final String TEST_PATH = '/' + TEST_NODE;
     private static final Map<NodeStoreFixture, NodeStore> STORES = 
Maps.newConcurrentMap();
 
+    private Repository repo;
+    private Session session;
     private Node testNode;
 
     private String unmappedNsPrefix;
@@ -61,8 +63,8 @@ public class ValidNamesTest extends Abst
 
     @Before
     public void setup() throws NamespaceException, RepositoryException {
-        Repository repo = createRepository(fixture);
-        Session session = repo.login(getAdminCredentials());
+        repo = createRepository(fixture);
+        session = repo.login(getAdminCredentials());
         Node root = session.getRootNode();
         testNode = root.addNode(TEST_NODE);
         session.save();
@@ -93,12 +95,15 @@ public class ValidNamesTest extends Abst
 
     @After
     public void tearDown() throws RepositoryException {
-        Session s = testNode.getSession();
-        s.removeItem(TEST_PATH);
-        s.save();
-        Repository r = s.getRepository();
-        s.logout();
-        dispose(r);
+        if (session != null) {
+            session.removeItem(TEST_PATH);
+            session.save();
+            session.logout();
+        }
+
+        if (repo != null) {
+            dispose(repo);
+        }
     }
 
     @AfterClass