You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/02/22 18:59:48 UTC
svn commit: r1073436 - in /myfaces/extensions/cdi/trunk/core:
api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/
api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/
impl/src/main/java/org/apache/myfaces/extensions/cdi/co...
Author: struberg
Date: Tue Feb 22 17:59:47 2011
New Revision: 1073436
URL: http://svn.apache.org/viewvc?rev=1073436&view=rev
Log:
code cleanup: don't catch Throwables
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java?rev=1073436&r1=1073435&r2=1073436&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java Tue Feb 22 17:59:47 2011
@@ -113,7 +113,7 @@ public class DefaultAnnotation implement
this.annotationClass = annotationClass;
}
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ public Object invoke(Object proxy, Method method, Object[] args) throws Exception
{
if ("hashCode".equals(method.getName()))
{
@@ -165,7 +165,7 @@ public class DefaultAnnotation implement
{
memberValue = invoke(this, methods[i], EMPTY_OBJECT_ARRAY);
}
- catch (Throwable throwable)
+ catch (Exception e)
{
memberValue = "";
}
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java?rev=1073436&r1=1073435&r2=1073436&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java Tue Feb 22 17:59:47 2011
@@ -112,7 +112,7 @@ public class ClassUtils
{
return targetClass.newInstance();
}
- catch (Throwable t)
+ catch (Exception t)
{
//do nothing - it was just a try
}
@@ -125,7 +125,7 @@ public class ClassUtils
{
return (T)targetClass.newInstance();
}
- catch (Throwable t)
+ catch (Exception t)
{
//do nothing - it was just a try
}
@@ -146,7 +146,7 @@ public class ClassUtils
{
return instantiateClassForName(className);
}
- catch (Throwable t)
+ catch (Exception t)
{
//do nothing - it was just a try
}
@@ -168,7 +168,7 @@ public class ClassUtils
return new Manifest(new URL(manifestFileLocation).openStream())
.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION);
}
- catch (Throwable t)
+ catch (Exception t)
{
return null;
}
@@ -183,7 +183,7 @@ public class ClassUtils
return new Manifest(new URL(manifestFileLocation).openStream())
.getMainAttributes().getValue("Revision");
}
- catch (Throwable t)
+ catch (Exception t)
{
return null;
}
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java?rev=1073436&r1=1073435&r2=1073436&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java Tue Feb 22 17:59:47 2011
@@ -105,7 +105,7 @@ public class CoreStartupObserver extends
this.logger.info(info.toString());
}
//avoid that this log harms the startup
- catch (Throwable t)
+ catch (Exception t)
{
this.logger.warning("Core-Module couldn't log the current configuration." +
"Startup will continue!");