Author: cziegeler Date: Mon Jan 24 07:35:45 2011 New Revision: 1062666 URL: http://svn.apache.org/viewvc?rev=1062666&view=rev Log: SLING-1943 : Sort services (transformer and factories) by service ranking before invoking
Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1062666&r1=1062665&r2=1062666&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java Mon Jan 24 07:35:45 2011 @@ -543,7 +543,6 @@ public class OsgiInstallerImpl */ private void transformResources() { boolean changed = false; - final List<ServiceReference> serviceRefs = this.transformerTracker.getSortedServiceReferences(); if ( serviceRefs.size() > 0 ) { Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java?rev=1062666&r1=1062665&r2=1062666&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java Mon Jan 24 07:35:45 2011 @@ -122,7 +122,7 @@ public class SortingServiceTracker<T> Arrays.sort(references); this.sortedReferences = new ArrayList<ServiceReference>(); for(int i=0;i<references.length;i++) { - this.sortedReferences.add(references[i]); + this.sortedReferences.add(references[references.length - 1 - i]); } } }