You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2014/05/20 11:09:55 UTC
git commit: fix failing tests after
b452c6fcdc68c3afcf89faf5d21bd5508ea7bd25
Repository: tapestry-5
Updated Branches:
refs/heads/master 737ebd64c -> 925e84bb4
fix failing tests after b452c6fcdc68c3afcf89faf5d21bd5508ea7bd25
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/925e84bb
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/925e84bb
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/925e84bb
Branch: refs/heads/master
Commit: 925e84bb4d92353cf60de87d17bc880aadda6c24
Parents: 737ebd6
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Tue May 20 11:09:13 2014 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Tue May 20 11:09:13 2014 +0200
----------------------------------------------------------------------
.../tapestry5/internal/services/PageResponseRendererImpl.java | 5 +++--
.../apache/tapestry5/internal/services/RenderQueueImpl.java | 6 ++++--
.../tapestry5/internal/services/RenderQueueImplTest.java | 2 ++
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/925e84bb/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
index 5ea88ec..c103d89 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
@@ -65,7 +65,8 @@ public class PageResponseRendererImpl implements PageResponseRenderer
PrintWriter pw = response.getPrintWriter(contentType.toString());
long startNanos = -1l;
- if (logger.isDebugEnabled())
+ boolean debugEnabled = logger.isDebugEnabled();
+ if (debugEnabled)
{
startNanos = System.nanoTime();
}
@@ -73,7 +74,7 @@ public class PageResponseRendererImpl implements PageResponseRenderer
long endNanos = System.nanoTime();
- if (logger.isDebugEnabled())
+ if (debugEnabled)
{
long elapsedNanos = endNanos - startNanos;
double elapsedSeconds = ((float) elapsedNanos) / 1000000000F;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/925e84bb/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java
index bf28118..e696d82 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java
@@ -50,9 +50,11 @@ public class RenderQueueImpl implements RenderQueue
RenderCommand command = null;
boolean traceEnabled = logger.isTraceEnabled(TapestryMarkers.RENDER_COMMANDS);
+ boolean debugEnabled = logger.isDebugEnabled();
long startNanos = -1l;
- if (logger.isDebugEnabled())
+
+ if (debugEnabled)
{
startNanos = System.nanoTime();
}
@@ -85,7 +87,7 @@ public class RenderQueueImpl implements RenderQueue
throw new RenderQueueException(message, renderingComponents.getSnapshot(), ex);
}
- if (logger.isDebugEnabled())
+ if (debugEnabled)
{
long endNanos = System.nanoTime();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/925e84bb/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java
index 0663587..a7bb699 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java
@@ -46,6 +46,7 @@ public class RenderQueueImplTest extends InternalBaseTestCase
// There's only one check for trace enabled now.
expect(logger.isTraceEnabled(TapestryMarkers.RENDER_COMMANDS)).andReturn(false);
+ expect(logger.isDebugEnabled()).andReturn(true);
logger.debug(eq(TapestryMarkers.RENDER_COMMANDS), isA(String.class));
@@ -87,6 +88,7 @@ public class RenderQueueImplTest extends InternalBaseTestCase
MarkupWriter writer = mockMarkupWriter();
expect(logger.isTraceEnabled(TapestryMarkers.RENDER_COMMANDS)).andReturn(false);
+ expect(logger.isDebugEnabled()).andReturn(true);
logger.error("Render queue error in FailedCommand: Oops.", t);