You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2012/12/12 19:16:21 UTC
svn commit: r1420898 - in /incubator/jspwiki/trunk: ChangeLog build.xml
src/org/apache/wiki/Release.java src/org/apache/wiki/util/PriorityList.java
Author: metskem
Date: Wed Dec 12 18:16:19 2012
New Revision: 1420898
URL: http://svn.apache.org/viewvc?rev=1420898&view=rev
Log:
2012-12-12 Harry Metske <me...@apache.org>
* 2.9.1-svn-5
* fixed JSPWIKI-742 NullPointerException in PriorityList (reported by Rakesh K. Cherukuri)
* minor updates to build.xml to properly handle build failures (I am not an ant expert...)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/org/apache/wiki/util/PriorityList.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1420898&r1=1420897&r2=1420898&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Dec 12 18:16:19 2012
@@ -1,4 +1,11 @@
-2012-12-09 Juan Pablo Santos (juanpablo AT apache DOT org)
+2012-12-12 Harry Metske <me...@apache.org>
+
+ * 2.9.1-svn-5
+
+ * fixed JSPWIKI-742 NullPointerException in PriorityList (reported by Rakesh K. Cherukuri)
+ * minor updates to build.xml to properly handle build failures (I am not an ant expert...)
+
+ 2012-12-09 Juan Pablo Santos (juanpablo AT apache DOT org)
* Sonar Ant task executed even if there are tests failures
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1420898&r1=1420897&r2=1420898&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed Dec 12 18:16:19 2012
@@ -863,13 +863,13 @@
<report format="noframes" todir="${tests.reports}" />
</junitreport>
- <antcall target="fail-build">
- <param name="test.failed" value="@{test.failed}"/>
+ <antcall target="fail-build-if-junit-fails">
+ <param name="test.failed" value="${test.failed}"/>
</antcall>
</target>
- <target name="fail-build" unless="continue_even_with_test_failures">
- <fail message="Test failure detected, check test results." if="test.failed" />
+ <target name="fail-build-if-junit-fails" unless="continue_even_with_test_failures">
+ <fail message="Test failure(s) detected, check test results." if="${test.failed}" />
</target>
<target name="tests-auth" depends="jar,tests-init,jartests"
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1420898&r1=1420897&r2=1420898&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Wed Dec 12 18:16:19 2012
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "4";
+ public static final String BUILD = "5";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/PriorityList.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/PriorityList.java?rev=1420898&r1=1420897&r2=1420898&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/PriorityList.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/PriorityList.java Wed Dec 12 18:16:19 2012
@@ -19,7 +19,7 @@
package org.apache.wiki.util;
import java.util.AbstractList;
-import java.util.ArrayList;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* Builds a simple, priority-based List implementation. The list
@@ -30,11 +30,10 @@ import java.util.ArrayList;
* Priority is an integer, and the list is sorted in descending order
* (that is, 100 is before 10 is before 0 is before -40).
*/
-@SuppressWarnings("unchecked")
public class PriorityList
extends AbstractList
{
- private ArrayList<Object> m_elements = new ArrayList<Object>();
+ private CopyOnWriteArrayList<Item> m_elements = new CopyOnWriteArrayList<Item>();
/**
* This is the default priority, which is used if no priority
@@ -55,7 +54,7 @@ public class PriorityList
for( ; i < m_elements.size(); i++ )
{
- Item item = (Item) m_elements.get(i);
+ Item item = m_elements.get(i);
if( item.m_priority < priority )
{
@@ -91,7 +90,7 @@ public class PriorityList
*/
public Object get( int index )
{
- return ((Item)m_elements.get( index )).m_object;
+ return m_elements.get( index ).m_object;
}
/**