Merge pull request #221 from Parabot/development

[MERGE] Development into master
This commit is contained in:
Jeroen Ketelaar
2017-08-28 23:57:55 +02:00
committed by GitHub
4 changed files with 25 additions and 6 deletions
+10 -1
View File
@@ -32,7 +32,7 @@ env:
- secure: UG+b1tEgc8xv9x4r//2OAIK1RrYv6n209KTTFMMwcnAa7DI8HaP8nljRa5/VhDhuKHdlVrYH/tI90v7UVBs0GDVNwK5V17Io0fMm3FUGZekSthTCqqno5wAGa9r6a6mMLtSaSmIFeIKi0+0d2ZwplRuhj/dtEYjjBBj+kK8g4nE=
- secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M=
- secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM=
- PARABOT_VERSION=2.6.6
- PARABOT_VERSION=2.6.6.6
cache:
directories:
@@ -57,3 +57,12 @@ deploy:
- master
- development
jdk: 'oraclejdk7'
- provider: script
script: "cp ./.travis/.travis.settings.xml $HOME/.m2/settings.xml && mvn package javadoc:javadoc deploy site:deploy"
skip_cleanup: true
on:
repo: Parabot/Parabot
branch:
- master
jdk: 'oraclejdk7'
+12
View File
@@ -0,0 +1,12 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>parabot-maven</id>
<username>${env.FTP_USERNAME}</username>
<password>${env.FTP_PASSWORD}</password>
</server>
</servers>
</settings>
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>org.parabot</groupId>
<artifactId>client</artifactId>
<version>2.6.6</version>
<version>2.6.6.6</version>
<packaging>jar</packaging>
@@ -6,6 +6,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
/**
*
@@ -309,10 +310,7 @@ public class RefClass extends RefModifiers {
try {
for (RefMethod method : getMethods()) {
if (method.getName().equals(name)) {
if (parameters == null) {
return method;
}
if (method.getParameterTypes().equals(parameters)) {
if (parameters == null || Arrays.equals(method.getParameterTypes(), parameters)) {
return method;
}
}