Author: stefanegli
Date: Thu May 23 12:59:01 2013
New Revision: 1485680
URL: http://svn.apache.org/r1485680
Log:
SLING-2879 : doing revert/refresh before updating the properties to work around
a potential issue in jackrabbit in a clustered environment
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/MockedResourceResolver.java
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java?rev=1485680&r1=1485679&r2=1485680&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
(original)
+++
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
Thu May 23 12:59:01 2013
@@ -346,6 +346,10 @@ public class DiscoveryServiceImpl implem
resourceResolver,
config.getClusterInstancesPath()
+ "/" + slingId + "/properties");
+ // SLING-2879 - revert/refresh resourceResolver here to work
+ // around a potential issue with jackrabbit in a clustered
environment
+ resourceResolver.revert();
+ resourceResolver.refresh();
final ModifiableValueMap myInstanceMap =
myInstance.adaptTo(ModifiableValueMap.class);
final Set<String> keys = new
HashSet<String>(myInstanceMap.keySet());
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/MockedResourceResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/MockedResourceResolver.java?rev=1485680&r1=1485679&r2=1485680&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/MockedResourceResolver.java
(original)
+++
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/MockedResourceResolver.java
Thu May 23 12:59:01 2013
@@ -252,7 +252,11 @@ public class MockedResourceResolver impl
}
public void revert() {
- throw new UnsupportedOperationException("Not implemented");
+ try {
+ this.session.refresh(false);
+ } catch (final RepositoryException re) {
+ throw new RuntimeException("Unable to commit changes.", re);
+ }
}
public void commit() throws PersistenceException {
