Author: fhanik
Date: Thu Sep 27 08:02:25 2007
New Revision: 580053
URL: http://svn.apache.org/viewvc?rev=580053&view=rev
Log:
forward port from 6.0
Modified:
tomcat/sandbox/gdev6x/java/org/apache/el/lang/FunctionMapperImpl.java
Modified: tomcat/sandbox/gdev6x/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/gdev6x/java/org/apache/el/lang/FunctionMapperImpl.java?rev=580053&r1=580052&r2=580053&view=diff
==============================================================================
--- tomcat/sandbox/gdev6x/java/org/apache/el/lang/FunctionMapperImpl.java
(original)
+++ tomcat/sandbox/gdev6x/java/org/apache/el/lang/FunctionMapperImpl.java Thu
Sep 27 08:02:25 2007
@@ -120,9 +120,16 @@
public void writeExternal(ObjectOutput out) throws IOException {
out.writeUTF((this.prefix != null) ? this.prefix : "");
out.writeUTF(this.localName);
- out.writeUTF(this.m.getDeclaringClass().getName());
- out.writeUTF(this.m.getName());
-
out.writeObject(ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
+ out.writeUTF((this.owner != null) ?
+ this.owner :
+ this.m.getDeclaringClass().getName());
+ out.writeUTF((this.name != null) ?
+ this.name :
+ this.m.getName());
+ out.writeObject((this.types != null) ?
+ this.types :
+
ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
+
}
/*
@@ -144,7 +151,7 @@
public Method getMethod() {
if (this.m == null) {
try {
- Class t = Class.forName(this.owner);
+ Class t = ReflectionUtil.forName(this.owner);
Class[] p = ReflectionUtil.toTypeArray(this.types);
this.m = t.getMethod(this.name, p);
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
