Author: hlship
Date: Thu Aug 11 19:28:52 2011
New Revision: 1156755
URL: http://svn.apache.org/viewvc?rev=1156755&view=rev
Log:
TAP5-1577: Duplication in operation trace when invoking certain methods
Modified:
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
Modified:
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java?rev=1156755&r1=1156754&r2=1156755&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
Thu Aug 11 19:28:52 2011
@@ -45,7 +45,7 @@ public class ConstructorServiceCreator e
public Object createObject()
{
- return resources.getTracker().invoke("Invoking " + creatorDescription,
new Invokable<Object>()
+ return resources.getTracker().invoke("Invoking constructor " +
creatorDescription, new Invokable<Object>()
{
public Object invoke()
{
Modified:
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java?rev=1156755&r1=1156754&r2=1156755&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
Thu Aug 11 19:28:52 2011
@@ -305,7 +305,7 @@ public class ModuleImpl implements Modul
return creator.createObject();
}
- creator = new OperationTrackingObjectCreator(registry,
"Invoking " + creator.toString(), creator);
+ creator = new OperationTrackingObjectCreator(registry,
"Invoking service creator " + creator.toString(), creator);
creator = new LifecycleWrappedServiceCreator(lifecycle,
resources, creator);
Modified:
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java?rev=1156755&r1=1156754&r2=1156755&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
Thu Aug 11 19:28:52 2011
@@ -42,14 +42,14 @@ public class ServiceBuilderMethodInvoker
*/
public Object createObject()
{
- // Defer getting (and possibly instantitating) the module instance
until the last possible
+ // Defer getting (and possibly instantiating) the module instance
until the last possible
// moment. If the method is static, there's no need to even get the
builder.
final Object moduleInstance = InternalUtils.isStatic(builderMethod) ?
null : resources.getModuleBuilder();
final OperationTracker tracker = resources.getTracker();
- return tracker.invoke(String.format("Invoking " + creatorDescription),
new Invokable<Object>()
+ return tracker.invoke(String.format("Constructing service
implementation via " + creatorDescription), new Invokable<Object>()
{
public Object invoke()
{
