You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/08/06 11:08:36 UTC
svn commit: r1154467 - in /maven/sandbox/trunk/plexus-utils-commons-bridge:
plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java
plexus-utils-tck/src/test/java/org/codehaus/plexus/util/ExceptionUtilsTest.java
Author: struberg
Date: Sat Aug 6 09:08:36 2011
New Revision: 1154467
URL: http://svn.apache.org/viewvc?rev=1154467&view=rev
Log:
MSANDBOX-51 improve tests and Exception
Modified:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/ExceptionUtilsTest.java
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java?rev=1154467&r1=1154466&r2=1154467&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java Sat Aug 6 09:08:36 2011
@@ -155,6 +155,10 @@ public class ExceptionUtils
{
return null;
}
+ catch (SecurityException e)
+ {
+ return null;
+ }
if ( method.getReturnType() == null || !method.getReturnType().isAssignableFrom( Throwable.class ) )
{
@@ -313,6 +317,11 @@ public class ExceptionUtils
// this is how the old plexus method failed ...
throw new IndexOutOfBoundsException( "Throwable to check must not be null" );
}
+ if ( fromIndex < 0 )
+ {
+ // this is how the old plexus method failed ...
+ throw new IndexOutOfBoundsException( "fromIndex must be > 0 but was: " + fromIndex );
+ }
if ( type != null)
{
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/ExceptionUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/ExceptionUtilsTest.java?rev=1154467&r1=1154466&r2=1154467&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/ExceptionUtilsTest.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/ExceptionUtilsTest.java Sat Aug 6 09:08:36 2011
@@ -364,6 +364,16 @@ public class ExceptionUtilsTest extends
//nothing to do, Exception was expected
}
+ try
+ {
+ ExceptionUtils.indexOfThrowable( testException, TestException.class, -1 );
+ fail( "indexOfThrowable with too large fromIndex" );
+ }
+ catch ( IndexOutOfBoundsException e )
+ {
+ //nothing to do, Exception was expected
+ }
+
// NPE safe tests
try
{