[KARAF-983] Cave repository scanning now accounts for removed bundles git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1200030 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/f883b7e3 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/f883b7e3 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/f883b7e3 Branch: refs/heads/master Commit: f883b7e336bdc947d7a4a9f23f92a9d2056031e2 Parents: 49f65ae Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Wed Nov 9 23:16:16 2011 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Wed Nov 9 23:16:16 2011 +0000 ---------------------------------------------------------------------- .../karaf/cave/server/storage/CaveRepositoryImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/f883b7e3/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java ---------------------------------------------------------------------- diff --git a/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java b/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java index 7a26948..9a59119 100644 --- a/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java +++ b/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java @@ -71,13 +71,8 @@ public class CaveRepositoryImpl extends CaveRepository { LOGGER.debug("Karaf Cave repository {} location has been created.", this.getName()); LOGGER.debug(locationFile.getAbsolutePath()); } - File repositoryXml = new File(locationFile, "repository.xml"); - if (repositoryXml.exists()) { - obrRepository = (RepositoryImpl) new DataModelHelperImpl().repository(repositoryXml.toURI().toURL()); - } else { - obrRepository = new RepositoryImpl(); - obrRepository.setName(this.getName()); - } + obrRepository = new RepositoryImpl(); + obrRepository.setName(this.getName()); } /** @@ -138,6 +133,8 @@ public class CaveRepositoryImpl extends CaveRepository { * @throws Exception in case of scan failure. */ public void scan() throws Exception { + obrRepository = new RepositoryImpl(); + obrRepository.setName(this.getName()); this.scan(new File(this.getLocation())); this.generateRepositoryXml(); }
