You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/07/13 07:09:06 UTC
karaf-cave git commit: [KARAF-4528] Fix CaveRepositoryMBeanImpl to
avoid to throw undesired IllegalArgumentException
Repository: karaf-cave
Updated Branches:
refs/heads/cave-3.x 859c8c241 -> 154db6aff
[KARAF-4528] Fix CaveRepositoryMBeanImpl to avoid to throw undesired IllegalArgumentException
Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/154db6af
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/154db6af
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/154db6af
Branch: refs/heads/cave-3.x
Commit: 154db6aff823d1afd4cdf75caba0588e67a45f21
Parents: 859c8c2
Author: rakechan <ra...@gmail.com>
Authored: Sat Jul 9 23:24:05 2016 +0530
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Wed Jul 13 09:07:59 2016 +0200
----------------------------------------------------------------------
.../internal/CaveRepositoryMBeanImpl.java | 28 ++++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/154db6af/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java
----------------------------------------------------------------------
diff --git a/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java b/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java
index cb09a0e..825d31f 100644
--- a/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java
+++ b/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java
@@ -84,63 +84,63 @@ public class CaveRepositoryMBeanImpl extends StandardMBean implements CaveReposi
}
public void destroyRepository(String name) throws Exception {
- if (getCaveRepositoryService().getRepository(name) != null) {
+ if (getCaveRepositoryService().getRepository(name) == null) {
throw new IllegalArgumentException("Cave repository " + name + " doesn't exist");
}
caveRepositoryService.destroy(name);
}
public void installRepository(String name) throws Exception {
- if (getCaveRepositoryService().getRepository(name) != null) {
+ if (getCaveRepositoryService().getRepository(name) == null) {
throw new IllegalArgumentException("Cave repository " + name + " doesn't exist");
}
caveRepositoryService.install(name);
}
public void uninstallRepository(String name) throws Exception {
- if (getCaveRepositoryService().getRepository(name) != null) {
+ if (getCaveRepositoryService().getRepository(name) == null) {
throw new IllegalArgumentException("Cave repository " + name + " doesn't exist");
}
caveRepositoryService.uninstall(name);
}
- public void populateRepository(String name, String url, boolean generateObr, String filter) throws Exception {
- if (getCaveRepositoryService().getRepository(name) != null) {
+ public void populateRepository(String name, String url, boolean generate, String filter) throws Exception {
+ if (getCaveRepositoryService().getRepository(name) == null) {
throw new IllegalArgumentException("Cave repository " + name + " doesn't exist");
}
CaveRepository repository = getCaveRepositoryService().getRepository(name);
- repository.populate(new URL(url), filter, generateObr);
- if (generateObr) {
+ repository.populate(new URL(url), filter, generate);
+ if (generate) {
getCaveRepositoryService().install(name);
}
}
- public void proxyRepository(String name, String url, boolean generateObr, String filter) throws Exception {
- if (getCaveRepositoryService().getRepository(name) != null) {
+ public void proxyRepository(String name, String url, boolean generate, String filter) throws Exception {
+ if (getCaveRepositoryService().getRepository(name) == null) {
throw new IllegalArgumentException("Cave repository " + name + " doesn't exist");
}
CaveRepository repository = getCaveRepositoryService().getRepository(name);
repository.proxy(new URL(url), filter);
- if (generateObr) {
+ if (generate) {
getCaveRepositoryService().install(name);
}
}
public void updateRepository(String name) throws Exception {
- if (getCaveRepositoryService().getRepository(name) != null) {
+ if (getCaveRepositoryService().getRepository(name) == null) {
throw new IllegalArgumentException("Cave repository " + name + " doesn't exist");
}
CaveRepository caveRepository = getCaveRepositoryService().getRepository(name);
caveRepository.scan();
}
- public void uploadArtifact(String repository, String artifactUrl, boolean generateObr) throws Exception {
- if (getCaveRepositoryService().getRepository(repository) != null) {
+ public void uploadArtifact(String repository, String artifactUrl, boolean generate) throws Exception {
+ if (getCaveRepositoryService().getRepository(repository) == null) {
throw new IllegalArgumentException("Cave repository " + repository + " doesn't exist");
}
CaveRepository caveRepository = getCaveRepositoryService().getRepository(repository);
caveRepository.upload(new URL(artifactUrl));
- if (generateObr) {
+ if (generate) {
getCaveRepositoryService().install(repository);
}
}