svn commit: r808818 - in /sling/trunk/installer/osgi/installer/src: main/java/org/apache/sling/osgi/installer/InstallableResource.java test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java

[bdelacretaz]

Author: bdelacretaz
Date: Fri Aug 28 08:53:59 2009
New Revision: 808818

URL: http://svn.apache.org/viewvc?rev=808818&view=rev
Log:
SLING-1078 - config digest takes URL into account

Modified:
    
sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java
    
sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java

Modified: 
sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java?rev=808818&r1=808817&r2=808818&view=diff
==============================================================================
--- 
sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java
 (original)
+++ 
sling/trunk/installer/osgi/installer/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java
 Fri Aug 28 08:53:59 2009
@@ -89,7 +89,7 @@
                this.inputStream = null;
                this.dictionary = d;
                try {
-               this.digest = computeDigest(d);
+               this.digest = url + ":" + computeDigest(d);
                } catch(Exception e) {
                    throw new IllegalStateException("Unexpected Exception while 
computing digest", e);
                }

Modified: 
sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java?rev=808818&r1=808817&r2=808818&view=diff
==============================================================================
--- 
sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java
 (original)
+++ 
sling/trunk/installer/osgi/installer/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java
 Fri Aug 28 08:53:59 2009
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.osgi.installer.impl;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -153,6 +154,15 @@
         assertEquals("RegisteredResource entity ID must match", 
"config:someconfig", r.getEntityId());
     }
     
+    @org.junit.Test public void testConfigDigestIncludesUrl() throws Exception 
{
+        final Dictionary<String, Object> data = new Hashtable<String, 
Object>();
+        final InstallableResource rA = new InstallableResource("test:urlA", 
data);
+        final InstallableResource rB = new InstallableResource("test:urlB", 
data);
+        assertFalse(
+                "Expecting configs with same data but different URLs to have 
different digests",
+                rA.getDigest().equals(rB.getDigest()));
+    }
+    
     @org.junit.Test public void testUrlScheme() throws Exception {
         final ByteArrayInputStream s = new 
ByteArrayInputStream("foo".getBytes());