Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix NPE in dependecy resolver when datasource is null
In some cases if you ask for resolving a dependency from the Neo store data source when the latter is not available a NPE is thrown. This change will fix that behaviour by skipping the unavailable data source from the list of possible dependency providers.
- Loading branch information
1 parent
419b959
commit da1c2a2
Showing
4 changed files
with
109 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...src/test/java/org/neo4j/kernel/impl/transaction/state/DependencyResolverSupplierTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
* Copyright (c) 2002-2016 "Neo Technology," | ||
* Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
* | ||
* This file is part of Neo4j. | ||
* | ||
* Neo4j is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
package org.neo4j.kernel.impl.transaction.state; | ||
|
||
|
||
import org.junit.Test; | ||
|
||
import org.neo4j.graphdb.DependencyResolver; | ||
import org.neo4j.kernel.NeoStoreDataSource; | ||
import org.neo4j.kernel.impl.transaction.state.DataSourceManager.DependencyResolverSupplier; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
import static org.mockito.Mockito.mock; | ||
import static org.mockito.Mockito.when; | ||
|
||
public class DependencyResolverSupplierTest | ||
{ | ||
@Test | ||
public void shouldReturnTheDependencyResolveFromTheRegisteredDatasource() throws Exception | ||
{ | ||
// given | ||
DataSourceManager dataSourceManager = new DataSourceManager(); | ||
DependencyResolverSupplier supplier = new DependencyResolverSupplier( dataSourceManager ); | ||
NeoStoreDataSource neoStoreDataSource = mock( NeoStoreDataSource.class ); | ||
DependencyResolver dependencyResolver = mock( DependencyResolver.class ); | ||
when( neoStoreDataSource.getDependencyResolver() ).thenReturn( dependencyResolver ); | ||
|
||
// when | ||
dataSourceManager.register( neoStoreDataSource ); | ||
|
||
// then | ||
assertEquals( dependencyResolver, supplier.get() ); | ||
} | ||
|
||
@Test | ||
public void shouldReturnNullIfDataSourceHasBeenUnregistered() throws Exception | ||
{ | ||
// given | ||
DataSourceManager dataSourceManager = new DataSourceManager(); | ||
DependencyResolverSupplier supplier = new DependencyResolverSupplier( dataSourceManager ); | ||
NeoStoreDataSource neoStoreDataSource = mock( NeoStoreDataSource.class ); | ||
DependencyResolver dependencyResolver = mock( DependencyResolver.class ); | ||
when( neoStoreDataSource.getDependencyResolver() ).thenReturn( dependencyResolver ); | ||
dataSourceManager.register( neoStoreDataSource ); | ||
|
||
// when | ||
dataSourceManager.unregister( neoStoreDataSource ); | ||
|
||
// then | ||
assertEquals( null, supplier.get() ); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters