Author: frankbille
Date: Tue Jan 22 15:07:25 2008
New Revision: 614368
URL: http://svn.apache.org/viewvc?rev=614368&view=rev
Log:
WICKET-1184: The stop method on the PageSavingThread didn't wait until the
thread was actually finished until it continued the execution to the main
thread. Also made the waiting for changes loop checking the stop field , so it
doesn't continue forever even if it's marked as stop.
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/DiskPageStoreTest.java
(with props)
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java?rev=614368&r1=614367&r2=614368&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/pagestore/DiskPageStore.java
Tue Jan 22 15:07:25 2008
@@ -923,7 +923,7 @@
while (stop == false)
{
// wait until we have something to save
- while (pagesToSaveActive.isEmpty())
+ while (pagesToSaveActive.isEmpty() && stop ==
false)
{
try
{
@@ -957,6 +957,8 @@
}
}
}
+
+ stop = false;
}
/**
@@ -965,6 +967,18 @@
public void stop()
{
stop = true;
+
+ // Block the calling thread until this thread has
really stopped running
+ while (stop)
+ {
+ try
+ {
+
Thread.sleep(getSavingThreadSleepTime());
+ }
+ catch (InterruptedException ignore)
+ {
+ }
+ }
}
};
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/DiskPageStoreTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/DiskPageStoreTest.java?rev=614368&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/DiskPageStoreTest.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/DiskPageStoreTest.java
Tue Jan 22 15:07:25 2008
@@ -0,0 +1,58 @@
+/*
+ * 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.pagestore;
+
+import junit.framework.TestCase;
+
+import org.apache.wicket.util.tester.WicketTester;
+
+/**
+ * @author frankbille
+ */
+public class DiskPageStoreTest extends TestCase
+{
+ /**
+ * The stop method on the PageSavingThread didn't wait until the thread
was actually finished
+ * until it continued the execution to the main thread. This can in
some situations lead to the
+ * main thread being terminated before the PageSavingThread.
+ *
+ * This test doesn't do anything but making sure that destroying the
[EMAIL PROTECTED] DiskPageStore} also
+ * stops the PageSavingThread.
+ */
+ public void testStoppingPageSavingThread()
+ {
+ new WicketTester();
+
+ DiskPageStore store = new DiskPageStore()
+ {
+ // Make sure that it's asynchronous, because that's
what we are testing here.
+ protected boolean isSynchronous()
+ {
+ return false;
+ }
+ };
+
+ // Assume that the PageSavingThread is in the same ThreadGroup
as the current thread.
+ int activeThreadsBefore = Thread.activeCount();
+
+ store.destroy();
+
+ int activeThreadsAfter = Thread.activeCount();
+
+ assertEquals(activeThreadsBefore - 1, activeThreadsAfter);
+ }
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/pagestore/DiskPageStoreTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
