Updated Branches: refs/heads/5.3 89a761eb7 -> 2c303a473
TAP5-1929: Remove unnecessary synchronization from certain lazy-initialization cases Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2c303a47 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2c303a47 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2c303a47 Branch: refs/heads/5.3 Commit: 2c303a473285cdc0365a2e26693de1cab47e801e Parents: 89a761e Author: Howard M. Lewis Ship <[email protected]> Authored: Sun Jun 3 12:04:23 2012 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Sun Jun 3 12:06:06 2012 -0700 ---------------------------------------------------------------------- .../internal/services/ClasspathAssetFactory.java | 2 +- .../internal/services/ContextAssetFactory.java | 2 +- .../ioc/internal/ConstructorServiceCreator.java | 2 +- .../tapestry5/ioc/internal/RegistryImpl.java | 2 +- .../ioc/internal/ServiceBuilderMethodInvoker.java | 2 +- .../ioc/internal/TypeCoercerProxyImpl.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2c303a47/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java index fb6c07f..8f298ab 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java @@ -122,7 +122,7 @@ public class ClasspathAssetFactory implements AssetFactory return resource; } - public synchronized String toClientURL() + public String toClientURL() { if (clientURL == null) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2c303a47/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java index 0132a4d..0a97214 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java @@ -70,7 +70,7 @@ public class ContextAssetFactory implements AssetFactory return resource; } - public synchronized String toClientURL() + public String toClientURL() { if (clientURL == null) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2c303a47/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java index ca86065..0335679 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java @@ -43,7 +43,7 @@ public class ConstructorServiceCreator extends AbstractServiceCreator private ObjectCreator<?> plan; - private synchronized ObjectCreator<?> getPlan() + private ObjectCreator<?> getPlan() { if (plan == null) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2c303a47/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java index b1c35f1..b61d017 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java @@ -1011,7 +1011,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro /** * Defers obtaining the symbol source until actually needed. */ - private synchronized SymbolSource getSymbolSource() + private SymbolSource getSymbolSource() { if (symbolSource == null) symbolSource = getService(SYMBOL_SOURCE_SERVICE_ID, SymbolSource.class); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2c303a47/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java index 87b5913..036aaf3 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java @@ -37,7 +37,7 @@ public class ServiceBuilderMethodInvoker extends AbstractServiceCreator private ObjectCreator<Object> plan; - private synchronized ObjectCreator<Object> getPlan() + private ObjectCreator<Object> getPlan() { if (plan == null) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2c303a47/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java index 0ee75a7..1a21fdc 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/TypeCoercerProxyImpl.java @@ -33,7 +33,7 @@ public final class TypeCoercerProxyImpl implements TypeCoercerProxy this.locator = locator; } - private synchronized TypeCoercer delegate() + private TypeCoercer delegate() { if (delegate == null) delegate = locator.getService(TypeCoercer.class);
