yoavs 2004/09/01 17:48:12
Modified: util/java/org/apache/tomcat/util IntrospectionUtils.java
util/java/org/apache/tomcat/util/digester XercesParser.java
Log:
Builds successfully on JDK 5.0.
Revision Changes Path
1.10 +2 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java
Index: IntrospectionUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IntrospectionUtils.java 29 Aug 2004 17:14:41 -0000 1.9
+++ IntrospectionUtils.java 2 Sep 2004 00:48:12 -0000 1.10
@@ -48,7 +48,7 @@
if (executeM == null) {
throw new RuntimeException("No execute in " + proxy.getClass());
}
- executeM.invoke(proxy, null);//new Object[] { args });
+ executeM.invoke(proxy, (Object[]) null);//new Object[] { args });
}
/**
@@ -371,7 +371,7 @@
for (int i = 0; i < methods.length; i++) {
Class paramT[] = methods[i].getParameterTypes();
if (getter.equals(methods[i].getName()) && paramT.length == 0) {
- return methods[i].invoke(o, null);
+ return methods[i].invoke(o, (Object[]) null);
}
if ("getProperty".equals(methods[i].getName())) {
1.2 +3 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/XercesParser.java
Index: XercesParser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/digester/XercesParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesParser.java 26 Jun 2004 17:41:30 -0000 1.1
+++ XercesParser.java 2 Sep 2004 00:48:12 -0000 1.2
@@ -102,8 +102,8 @@
Class.forName("org.apache.xerces.impl.Version");
// Will return Xerces-J 2.x.0
Method method =
- versionClass.getMethod("getVersion", null);
- String version = (String)method.invoke(null,null);
+ versionClass.getMethod("getVersion", (Class[]) null);
+ String version = (String)method.invoke(null, (Object[]) null);
versionNumber = version.substring( "Xerces-J".length() ,
version.lastIndexOf(".") );
} catch (Exception ex){
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
