You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/10/05 14:01:31 UTC
svn commit: r1394465 -
/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java
Author: cziegeler
Date: Fri Oct 5 12:01:31 2012
New Revision: 1394465
URL: http://svn.apache.org/viewvc?rev=1394465&view=rev
Log:
SLING-2570 : Use Wiring API to check whether Installer Core bundle is affect by a bundle update
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java
Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java?rev=1394465&r1=1394464&r2=1394465&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/TaskSupport.java Fri Oct 5 12:01:31 2012
@@ -89,11 +89,11 @@ public class TaskSupport {
checkedWireAdmin = false;
}
}
- if ( checkedWireAdmin ) {
- return new PABundleRefresher((PackageAdmin) this.packageAdminTracker.getService(),
+ if ( checkedWireAdmin.booleanValue() ) {
+ return new WABundleRefresher(this.bundleContext.getBundle(0).adapt(FrameworkWiring.class),
this.bundleContext);
} else {
- return new WABundleRefresher(this.bundleContext.getBundle(0).adapt(FrameworkWiring.class),
+ return new PABundleRefresher((PackageAdmin) this.packageAdminTracker.getService(),
this.bundleContext);
}
}