Author: cziegeler
Date: Wed Oct 1 07:50:03 2014
New Revision: 1628632
URL: http://svn.apache.org/r1628632
Log:
Make dynamic fields volatile
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java?rev=1628632&r1=1628631&r2=1628632&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentFactory.java
Wed Oct 1 07:50:03 2014
@@ -93,11 +93,11 @@ public class SimpleReplicationAgentFacto
@Property(label = "Target ReplicationPackageExporter", name =
PACKAGE_EXPORTER_TARGET)
@Reference(name = "ReplicationPackageExporter", policy =
ReferencePolicy.DYNAMIC)
- private ReplicationPackageExporter packageExporter;
+ private volatile ReplicationPackageExporter packageExporter;
@Property(label = "Target ReplicationPackageImporter", name =
PACKAGE_IMPORTER_TARGET)
@Reference(name = "ReplicationPackageImporter", policy =
ReferencePolicy.DYNAMIC)
- private ReplicationPackageImporter packageImporter;
+ private volatile ReplicationPackageImporter packageImporter;
@Property(label = "Target ReplicationQueueProvider", name =
QUEUEPROVIDER_TARGET, value = DEFAULT_QUEUEPROVIDER)
@Reference(name = "ReplicationQueueProvider", target =
DEFAULT_QUEUEPROVIDER, policy = ReferencePolicy.DYNAMIC)
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java?rev=1628632&r1=1628631&r2=1628632&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/exporter/RemoteReplicationPackageExporterFactory.java
Wed Oct 1 07:50:03 2014
@@ -61,11 +61,11 @@ public class RemoteReplicationPackageExp
@Property(name =
ReplicationTransportConstants.TRANSPORT_AUTHENTICATION_PROVIDER_TARGET)
@Reference(name = "TransportAuthenticationProviderFactory", policy =
ReferencePolicy.DYNAMIC)
- private TransportAuthenticationProvider transportAuthenticationProvider;
+ private volatile TransportAuthenticationProvider
transportAuthenticationProvider;
@Property(label = "Target ReplicationPackageBuilder", name =
"ReplicationPackageBuilder.target")
@Reference(name = "ReplicationPackageBuilder", policy =
ReferencePolicy.DYNAMIC)
- private ReplicationPackageBuilder packageBuilder;
+ private volatile ReplicationPackageBuilder packageBuilder;
@Property(name = "poll items", description = "number of subsequent poll
requests to make", intValue = 1)
public static final String POLL_ITEMS = "poll.items";
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java?rev=1628632&r1=1628631&r2=1628632&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/AdvancedRemoteReplicationPackageImporter.java
Wed Oct 1 07:50:03 2014
@@ -62,7 +62,7 @@ public class AdvancedRemoteReplicationPa
@Property(name =
ReplicationTransportConstants.TRANSPORT_AUTHENTICATION_PROVIDER_TARGET)
@Reference(name = "TransportAuthenticationProvider", policy =
ReferencePolicy.DYNAMIC)
- private TransportAuthenticationProvider transportAuthenticationProvider;
+ private volatile TransportAuthenticationProvider
transportAuthenticationProvider;
@Property(options = {
@PropertyOption(name = "All",
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java?rev=1628632&r1=1628631&r2=1628632&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/impl/importer/RemoteReplicationPackageImporterFactory.java
Wed Oct 1 07:50:03 2014
@@ -58,7 +58,7 @@ public class RemoteReplicationPackageImp
@Property(name =
ReplicationTransportConstants.TRANSPORT_AUTHENTICATION_PROVIDER_TARGET)
@Reference(name = "TransportAuthenticationProviderFactory", policy =
ReferencePolicy.DYNAMIC)
- private TransportAuthenticationProvider transportAuthenticationProvider;
+ private volatile TransportAuthenticationProvider
transportAuthenticationProvider;
@Property(options = {
@PropertyOption(name = "All",
