You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2014/12/05 19:41:36 UTC
wicket git commit: WICKET-5784 fixed copying of requests
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 6d2334974 -> 2a2539095
WICKET-5784 fixed copying of requests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2a253909
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2a253909
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2a253909
Branch: refs/heads/wicket-6.x
Commit: 2a25390957d9151e6176830cb617f42d1f5680f3
Parents: 6d23349
Author: Sven Meier <sv...@apache.org>
Authored: Fri Dec 5 19:40:46 2014 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Fri Dec 5 19:40:46 2014 +0100
----------------------------------------------------------------------
.../protocol/http/AbstractRequestLogger.java | 17 ++--
.../http/AbstractRequestLoggerTest.java | 88 ++++++++++++++++++++
2 files changed, 95 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2a253909/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
index f6d18ed..32e0e45 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/AbstractRequestLogger.java
@@ -161,20 +161,17 @@ public abstract class AbstractRequestLogger implements IRequestLogger
*/
private void copyRequestsInOrder(RequestData[] copy)
{
+ int destPos = 0;
+
if (hasBufferRolledOver())
{
+ destPos = requestWindow.length - indexInWindow;
+
// first copy the oldest requests stored behind the cursor into the copy
- int oldestPos = indexInWindow + 1;
- if (oldestPos < requestWindow.length)
- arraycopy(requestWindow, oldestPos, copy, 0, requestWindow.length - oldestPos);
-
- // then append the newer requests stored from index 0 til the cursor position.
- arraycopy(requestWindow, 0, copy, requestWindow.length - oldestPos, indexInWindow);
- }
- else
- {
- arraycopy(requestWindow, 0, copy, 0, indexInWindow);
+ arraycopy(requestWindow, indexInWindow, copy, 0, destPos);
}
+
+ arraycopy(requestWindow, 0, copy, destPos, indexInWindow);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/2a253909/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
new file mode 100644
index 0000000..0d63b67
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/AbstractRequestLoggerTest.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.protocol.http;
+
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.protocol.http.IRequestLogger.RequestData;
+import org.junit.Test;
+
+/**
+ * Test for {@link AbstractRequestLogger}.
+ */
+public class AbstractRequestLoggerTest extends WicketTestCase
+{
+
+ private int counter;
+
+ @Test
+ public void foo()
+ {
+ tester.getApplication().getRequestLoggerSettings().setRequestsWindowSize(4);
+
+ AbstractRequestLogger logger = new AbstractRequestLogger()
+ {
+ @Override
+ protected void log(RequestData rd, SessionData sd)
+ {
+ }
+ };
+
+ logger.addRequest(requestData());
+ assertEquals(1, logger.getRequests().size());
+ assertEquals("0", logger.getRequests().get(0).getRequestedUrl());
+
+ logger.addRequest(requestData());
+ assertEquals(2, logger.getRequests().size());
+ assertEquals("1", logger.getRequests().get(1).getRequestedUrl());
+
+ logger.addRequest(requestData());
+ assertEquals(3, logger.getRequests().size());
+ assertEquals("2", logger.getRequests().get(2).getRequestedUrl());
+
+ logger.addRequest(requestData());
+ assertEquals(4, logger.getRequests().size());
+ assertEquals("3", logger.getRequests().get(3).getRequestedUrl());
+
+ logger.addRequest(requestData());
+ assertEquals(4, logger.getRequests().size());
+ assertEquals("4", logger.getRequests().get(3).getRequestedUrl());
+
+ logger.addRequest(requestData());
+ assertEquals(4, logger.getRequests().size());
+ assertEquals("5", logger.getRequests().get(3).getRequestedUrl());
+
+ logger.addRequest(requestData());
+ assertEquals(4, logger.getRequests().size());
+ assertEquals("6", logger.getRequests().get(3).getRequestedUrl());
+
+ logger.addRequest(requestData());
+ assertEquals(4, logger.getRequests().size());
+ assertEquals("7", logger.getRequests().get(3).getRequestedUrl());
+
+ logger.addRequest(requestData());
+ assertEquals(4, logger.getRequests().size());
+ assertEquals("8", logger.getRequests().get(3).getRequestedUrl());
+}
+
+ private RequestData requestData() {
+ RequestData data = new RequestData();
+
+ data.setRequestedUrl("" + counter++);
+
+ return data;
+ }
+}