Repository: zest-java Updated Branches: refs/heads/develop 845e92d78 -> 45624ba49
Remove unnecessary "public static" Added a null check, that probably never trigger, but still.. Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/852d583a Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/852d583a Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/852d583a Branch: refs/heads/develop Commit: 852d583a3e5082e42df50e3591e7ea85fc0849b3 Parents: 845e92d Author: Niclas Hedhman <[email protected]> Authored: Fri Apr 15 00:12:04 2016 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Fri Apr 15 00:12:04 2016 +0800 ---------------------------------------------------------------------- .../library/rdf/repository/NativeRepositoryService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/852d583a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java ---------------------------------------------------------------------- diff --git a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java index d134f22..2ef074b 100644 --- a/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java +++ b/libraries/rdf/src/main/java/org/apache/zest/library/rdf/repository/NativeRepositoryService.java @@ -44,7 +44,7 @@ public interface NativeRepositoryService extends Repository, ServiceComposite, A void shutDown() throws RepositoryException; - public static class Activator + class Activator extends ActivatorAdapter<ServiceReference<NativeRepositoryService>> { @@ -63,7 +63,7 @@ public interface NativeRepositoryService extends Repository, ServiceComposite, A } } - public static abstract class NativeRepositoryMixin + abstract class NativeRepositoryMixin implements NativeRepositoryService, ResetableRepository { @Optional @@ -179,6 +179,10 @@ public interface NativeRepositoryService extends Repository, ServiceComposite, A private void delete( File dataDir ) { File[] children = dataDir.listFiles(); + if( children == null ) + { + return; + } for( File child : children ) { if( child.isDirectory() ) @@ -208,6 +212,7 @@ public interface NativeRepositoryService extends Repository, ServiceComposite, A store.setDataDir( dataDir ); store.setTripleIndexes( tripleIndexes ); store.setForceSync( forceSync ); + System.err.println( "NICLASS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ); repo.initialize(); isNotInitialized = false; }
