Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x

This commit is contained in:
Joakim Erdfelt 2016-11-29 15:49:21 -07:00
parent 70247d74d9 9b0f6b1fd5
commit 6c48d62da6
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PostConstructAnnotationHandler.java
View File

@ -52,7 +52,7 @@ public class PostConstructAnnotationHandler extends AbstractIntrospectableAnnota
Method m = (Method)methods[i];
if (m.isAnnotationPresent(PostConstruct.class))
{
if (m.getParameterTypes().length != 0)
if (m.getParameterCount() != 0)
throw new IllegalStateException(m+" has parameters");
if (m.getReturnType() != Void.TYPE)
throw new IllegalStateException(m+" is not void");

2
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/PreDestroyAnnotationHandler.java
View File

@ -51,7 +51,7 @@ public class PreDestroyAnnotationHandler extends AbstractIntrospectableAnnotatio
Method m = (Method)methods[i];
if (m.isAnnotationPresent(PreDestroy.class))
{
if (m.getParameterTypes().length != 0)
if (m.getParameterCount() != 0)
throw new IllegalStateException(m+" has parameters");
if (m.getReturnType() != Void.TYPE)
throw new IllegalStateException(m+" is not void");

2
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
View File

@ -257,7 +257,7 @@ public class ResourceAnnotationHandler extends AbstractIntrospectableAnnotationH
return;
}
if (method.getParameterTypes().length != 1)
if (method.getParameterCount() != 1)
{
LOG.warn("Skipping Resource annotation on "+clazz.getName()+"."+method.getName()+": invalid java bean, not single argument to method");
return;

4
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
View File

@ -663,7 +663,7 @@ public class ObjectMBean implements DynamicMBean
{
// look for a declared setter
if (methods[m].getName().equals(declaredSetter) && methods[m].getParameterTypes().length == 1)
if (methods[m].getName().equals(declaredSetter) && methods[m].getParameterCount() == 1)
{
if (setter != null)
{
@ -682,7 +682,7 @@ public class ObjectMBean implements DynamicMBean
}
// look for a setter
if ( methods[m].getName().equals("set" + uName) && methods[m].getParameterTypes().length == 1)
if ( methods[m].getName().equals("set" + uName) && methods[m].getParameterCount() == 1)
{
if (setter != null)
{

2
jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java
View File

@ -80,7 +80,7 @@ public class JSONObjectConvertor implements JSON.Convertor
{
Method m=methods[i];
if (!Modifier.isStatic(m.getModifiers()) &&
m.getParameterTypes().length==0 &&
m.getParameterCount()==0 &&
m.getReturnType()!=null &&
m.getDeclaringClass()!=Object.class)
{

2
jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java
View File

@ -116,7 +116,7 @@ public class JSONPojoConvertor implements JSON.Convertor
if (!Modifier.isStatic(m.getModifiers()) && m.getDeclaringClass()!=Object.class)
{
String name=m.getName();
switch(m.getParameterTypes().length)
switch(m.getParameterCount())
{
case 0:

2
jetty-util/src/main/java/org/eclipse/jetty/util/IntrospectionUtil.java
View File

@ -44,7 +44,7 @@ public class IntrospectionUtil
if (!method.getName().startsWith("set"))
return false;
if (method.getParameterTypes().length != 1)
if (method.getParameterCount() != 1)
return false;
return true;

12
jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
View File

@ -511,7 +511,7 @@ public class TypeUtil
{
if (!method.getName().equals(methodName))
continue;
if (method.getParameterTypes().length != arg.length)
if (method.getParameterCount() != arg.length)
continue;
if (Modifier.isStatic(method.getModifiers()) != (obj == null))
continue;
@ -535,7 +535,7 @@ public class TypeUtil
{
if (!method.getName().equals(methodName))
continue;
if (method.getParameterTypes().length != arg.length+1)
if (method.getParameterCount() != arg.length+1)
continue;
if (!method.getParameterTypes()[arg.length].isArray())
continue;
@ -569,10 +569,10 @@ public class TypeUtil
if (arguments == null)
{
// null arguments in .newInstance() is allowed
if (constructor.getParameterTypes().length != 0)
if (constructor.getParameterCount() != 0)
continue;
}
else if (constructor.getParameterTypes().length != arguments.length)
else if (constructor.getParameterCount() != arguments.length)
continue;
try
@ -597,10 +597,10 @@ public class TypeUtil
if (arguments == null)
{
// null arguments in .newInstance() is allowed
if (constructor.getParameterTypes().length != 0)
if (constructor.getParameterCount() != 0)
continue;
}
else if (constructor.getParameterTypes().length != arguments.length)
else if (constructor.getParameterCount() != arguments.length)
continue;
try