costin 2005/09/28 22:55:15 Modified: catalina/src/share/org/apache/catalina/core AprLifecycleListener.java catalina/src/share/org/apache/catalina/startup Bootstrap.java WebRuleSet.java catalina/src/share/org/apache/catalina/util StringManager.java Log: Remove annoying warnings when compiling with JDK1.5 ( without source=1.3 ), just casts to the normal params to avoid conflict with the vararg variants. Revision Changes Path 1.4 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java Index: AprLifecycleListener.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AprLifecycleListener.java 1 Aug 2005 12:13:59 -0000 1.3 +++ AprLifecycleListener.java 29 Sep 2005 05:55:14 -0000 1.4 @@ -101,8 +101,8 @@ try { String methodName = "terminate"; Method method = Class.forName("org.apache.tomcat.jni.Library") - .getMethod(methodName, null); - method.invoke(null, null); + .getMethod(methodName, (Class [])null); + method.invoke(null, (Object []) null); } catch (Throwable t) { if (!log.isDebugEnabled()) { log.info(sm.getString("aprListener.aprDestroy")); 1.24 +7 -7 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java Index: Bootstrap.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Bootstrap.java 15 Sep 2005 06:04:01 -0000 1.23 +++ Bootstrap.java 29 Sep 2005 05:55:14 -0000 1.24 @@ -271,8 +271,8 @@ throws Exception { if( catalinaDaemon==null ) init(); - Method method = catalinaDaemon.getClass().getMethod("start", null); - method.invoke(catalinaDaemon, null); + Method method = catalinaDaemon.getClass().getMethod("start", (Class [] )null); + method.invoke(catalinaDaemon, (Object [])null); } @@ -283,8 +283,8 @@ public void stop() throws Exception { - Method method = catalinaDaemon.getClass().getMethod("stop", null); - method.invoke(catalinaDaemon, null); + Method method = catalinaDaemon.getClass().getMethod("stop", (Class [] ) null); + method.invoke(catalinaDaemon, (Object [] ) null); } @@ -296,8 +296,8 @@ throws Exception { Method method = - catalinaDaemon.getClass().getMethod("stopServer", null); - method.invoke(catalinaDaemon, null); + catalinaDaemon.getClass().getMethod("stopServer", (Class []) null); + method.invoke(catalinaDaemon, (Object []) null); } 1.15 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java Index: WebRuleSet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- WebRuleSet.java 26 Jul 2004 16:04:01 -0000 1.14 +++ WebRuleSet.java 29 Sep 2005 05:55:14 -0000 1.15 @@ -576,7 +576,7 @@ return; } - m.invoke(top, paramValues); + m.invoke(top, (Object [])paramValues); if (digester.getLogger().isDebugEnabled()) digester.getLogger().debug("" + top.getClass().getName() + "." + method + "(" + paramValues[0] + ")"); 1.8 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java Index: StringManager.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- StringManager.java 16 Sep 2004 23:19:54 -0000 1.7 +++ StringManager.java 29 Sep 2005 05:55:15 -0000 1.8 @@ -101,7 +101,7 @@ * @param key The resource name */ public String getString(String key) { - return MessageFormat.format(getStringInternal(key), null); + return MessageFormat.format(getStringInternal(key), (Object [])null); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]