Author: bdelacretaz
Date: Mon May 4 08:47:53 2009
New Revision: 771236
URL: http://svn.apache.org/viewvc?rev=771236&view=rev
Log:
SLING-904 - remove unused return value
Modified:
incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiController.java
incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java
Modified:
incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiController.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiController.java?rev=771236&r1=771235&r2=771236&view=diff
==============================================================================
---
incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiController.java
(original)
+++
incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiController.java
Mon May 4 08:47:53 2009
@@ -32,7 +32,7 @@
* @param data The data to install
* @return one of the {...@link InstallResultCode} result codes.
*/
- int scheduleInstallOrUpdate(String uri, InstallableData data) throws
IOException, JcrInstallException;
+ void scheduleInstallOrUpdate(String uri, InstallableData data) throws
IOException, JcrInstallException;
/** Schedule uninstallation of resource that was installed via given uri.
* Might be called several times for the same URI - needless calls should
Modified:
incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java?rev=771236&r1=771235&r2=771236&view=diff
==============================================================================
---
incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java
(original)
+++
incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java
Mon May 4 08:47:53 2009
@@ -107,8 +107,7 @@
processors = null;
}
- public int scheduleInstallOrUpdate(String uri, InstallableData data)
throws IOException, JcrInstallException {
- int result = IGNORED;
+ public void scheduleInstallOrUpdate(String uri, InstallableData data)
throws IOException, JcrInstallException {
// If a corresponding higher priority resource is already installed,
ignore this one
if(roRules != null) {
@@ -116,7 +115,7 @@
if(storage.contains(r)) {
log.info("Resource {} ignored, overridden by {} which has
higher priority",
uri, r);
- return IGNORED;
+ return;
}
}
}
@@ -137,8 +136,7 @@
if (p != null) {
try {
final Map<String, Object> map = storage.getMap(uri);
- result = p.installOrUpdate(uri, map, data);
- if (result != IGNORED) {
+ if(p.installOrUpdate(uri, map, data) != IGNORED) {
map.put(KEY_DIGEST, data.getDigest());
}
storage.saveToFile();
@@ -148,7 +146,7 @@
throw new JcrInstallException("Exception in installOrUpdate ("
+ uri + ")", e);
}
}
- return result;
+ return;
}
public void scheduleUninstall(String uri) throws JcrInstallException {
