You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2002/10/25 21:24:27 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/extensions ExtensionHandlerJavaClass.java ExtensionHandlerJavaPackage.java
mkwan 2002/10/25 12:24:27
Modified: java/src/org/apache/xalan/extensions
ExtensionHandlerJavaClass.java
ExtensionHandlerJavaPackage.java
Log:
For bugzilla 13944. Check for InvocationTargetException in Method.invoke().
Revision Changes Path
1.13 +20 -6 xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
Index: ExtensionHandlerJavaClass.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ExtensionHandlerJavaClass.java 16 Aug 2002 14:13:30 -0000 1.12
+++ ExtensionHandlerJavaClass.java 25 Oct 2002 19:24:27 -0000 1.13
@@ -247,6 +247,10 @@
MethodResolver.convertParams(methodArgs, convertedArgs, paramTypes, exprContext);
return c.newInstance(convertedArgs[0]);
}
+ catch (InvocationTargetException ite)
+ {
+ throw ite;
+ }
catch(Exception e)
{
// Must not have been the right one
@@ -300,6 +304,10 @@
}
}
}
+ catch (InvocationTargetException ite)
+ {
+ throw ite;
+ }
catch(Exception e)
{
// Must not have been the right one
@@ -352,11 +360,15 @@
}
catch (InvocationTargetException ite)
{
- Throwable realException = ite.getTargetException();
- if (realException instanceof Exception)
- throw new TransformerException((Exception) realException);
- else
- throw new TransformerException(ite);
+ Throwable resultException = ite;
+ Throwable targetException = ite.getTargetException();
+
+ if (targetException instanceof TransformerException)
+ throw ((TransformerException)targetException);
+ else if (targetException != null)
+ resultException = targetException;
+
+ throw new TransformerException(resultException);
}
catch (Exception e)
{
@@ -423,7 +435,9 @@
{
Throwable targetException = e.getTargetException();
- if (targetException != null)
+ if (targetException instanceof TransformerException)
+ throw (TransformerException)targetException;
+ else if (targetException != null)
throw new TransformerException (targetException.getMessage (), targetException);
else
throw new TransformerException (e.getMessage (), e);
1.13 +33 -5 xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
Index: ExtensionHandlerJavaPackage.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ExtensionHandlerJavaPackage.java 3 Oct 2002 19:14:54 -0000 1.12
+++ ExtensionHandlerJavaPackage.java 25 Oct 2002 19:24:27 -0000 1.13
@@ -276,6 +276,10 @@
MethodResolver.convertParams(methodArgs, convertedArgs, paramTypes, exprContext);
return c.newInstance(convertedArgs[0]);
}
+ catch (InvocationTargetException ite)
+ {
+ throw ite;
+ }
catch(Exception e)
{
// Must not have been the right one
@@ -315,6 +319,10 @@
MethodResolver.convertParams(methodArgs, convertedArgs, paramTypes, exprContext);
return m.invoke(null, convertedArgs[0]);
}
+ catch (InvocationTargetException ite)
+ {
+ throw ite;
+ }
catch(Exception e)
{
// Must not have been the right one
@@ -365,6 +373,10 @@
MethodResolver.convertParams(methodArgs, convertedArgs, paramTypes, exprContext);
return m.invoke(targetObject, convertedArgs[0]);
}
+ catch (InvocationTargetException ite)
+ {
+ throw ite;
+ }
catch(Exception e)
{
// Must not have been the right one
@@ -383,11 +395,15 @@
}
catch (InvocationTargetException ite)
{
- Throwable realException = ite.getTargetException();
- if (realException instanceof Exception)
- throw new TransformerException((Exception) realException);
- else
- throw new TransformerException(ite);
+ Throwable resultException = ite;
+ Throwable targetException = ite.getTargetException();
+
+ if (targetException instanceof TransformerException)
+ throw ((TransformerException)targetException);
+ else if (targetException != null)
+ resultException = targetException;
+
+ throw new TransformerException(resultException);
}
catch (Exception e)
{
@@ -462,6 +478,18 @@
try
{
result = m.invoke(null, new Object[] {xpc, element});
+ }
+ catch (InvocationTargetException ite)
+ {
+ Throwable resultException = ite;
+ Throwable targetException = ite.getTargetException();
+
+ if (targetException instanceof TransformerException)
+ throw ((TransformerException)targetException);
+ else if (targetException != null)
+ resultException = targetException;
+
+ throw new TransformerException(resultException);
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org