incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1345674 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java
Date Sun, 03 Jun 2012 13:49:08 GMT
Author: cziegeler
Date: Sun Jun  3 13:49:07 2012
New Revision: 1345674

URL: http://svn.apache.org/viewvc?rev=1345674&view=rev
Log:
SLING-2500 : NPE in SortingServiceTracker#getSortedServices

Modified:
    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/SortingServiceTracker.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java?rev=1345674&r1=1345673&r2=1345674&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
Sun Jun  3 13:49:07 2012
@@ -119,7 +119,7 @@ public class SortingServiceTracker<T>
      */
     public List<ServiceReference> getSortedServiceReferences() {
         List<ServiceReference> result = this.sortedReferences;
-        if ( this.sortedReferences == null || this.lastRefCount < this.getTrackingCount()
) {
+        if ( result == null || this.lastRefCount < this.getTrackingCount() ) {
             this.lastRefCount = this.getTrackingCount();
             final ServiceReference[] references = this.getServiceReferences();
             if ( references == null || references.length == 0 ) {



Mime
View raw message