You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/07/03 15:50:16 UTC
svn commit: r1689013 - in /sling/trunk/installer/core/src:
main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java
Author: bdelacretaz
Date: Fri Jul 3 13:50:15 2015
New Revision: 1689013
URL: http://svn.apache.org/r1689013
Log:
SLING-4854 - ignore null getEntityId in comparison
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java
Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java?rev=1689013&r1=1689012&r2=1689013&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java Fri Jul 3 13:50:15 2015
@@ -425,8 +425,15 @@ public class RegisteredResourceImpl
* the symbolic name of a bundle, the pid for a configuration etc.
*/
public static int compare(final TaskResource a, final TaskResource b) {
+ int result = 0;
+
// check entity id first
- int result = a.getEntityId().compareTo(b.getEntityId());
+ final String aId = a.getEntityId();
+ final String bId = b.getEntityId();
+ if(aId != null && bId != null) {
+ result = aId.compareTo(bId);
+ }
+
boolean hasVersion = false;
if ( result == 0 ) {
// compare versions
Modified: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java?rev=1689013&r1=1689012&r2=1689013&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java Fri Jul 3 13:50:15 2015
@@ -34,7 +34,6 @@ import org.apache.sling.installer.api.In
import org.apache.sling.installer.api.tasks.RegisteredResource;
import org.apache.sling.installer.api.tasks.ResourceState;
import org.apache.sling.installer.api.tasks.TransformationResult;
-import org.junit.Ignore;
import org.junit.Test;
public class RegisteredResourceComparatorTest {
@@ -220,13 +219,12 @@ public class RegisteredResourceComparato
}
@Test
- @Ignore("SLING-4854")
public void testNullEntityId() throws IOException {
final SortedSet<RegisteredResource> set = new TreeSet<RegisteredResource>();
final RegisteredResource a = untransformedResource("a", 1);
- final RegisteredResource b = untransformedResource("b", 2);
+ final RegisteredResource b = untransformedResource("b", 1);
set.add(a);
set.add(b);
- assertEquals("Expecting a to be first", set.first(), a);
+ assertEquals("Expecting a to be first", a, set.first());
}
}
\ No newline at end of file