You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/10/15 05:25:30 UTC
[1/3] ant git commit: createAndSet never returns null
Repository: ant
Updated Branches:
refs/heads/1.9.x 013e9159e -> 9ec11ae3b
createAndSet never returns null
based on pytch by Kui Liu
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/99a7f591
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/99a7f591
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/99a7f591
Branch: refs/heads/1.9.x
Commit: 99a7f5916b38113f7e80997cd6b576c624b6efcd
Parents: 013e915
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Oct 15 07:24:15 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Oct 15 07:24:15 2017 +0200
----------------------------------------------------------------------
.../org/apache/tools/ant/AntTypeDefinition.java | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/99a7f591/src/main/org/apache/tools/ant/AntTypeDefinition.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java
index 104820f..c7b223c 100644
--- a/src/main/org/apache/tools/ant/AntTypeDefinition.java
+++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java
@@ -217,19 +217,12 @@ public class AntTypeDefinition {
return null;
}
Object o = createAndSet(project, c);
- if (o == null || adapterClass == null) {
+ if (adapterClass == null
+ || (adaptToClass != null && adaptToClass.isAssignableFrom(o.getClass()))) {
return o;
}
- if (adaptToClass != null) {
- if (adaptToClass.isAssignableFrom(o.getClass())) {
- return o;
- }
- }
TypeAdapter adapterObject = (TypeAdapter) createAndSet(
project, adapterClass);
- if (adapterObject == null) {
- return null;
- }
adapterObject.setProxy(o);
return adapterObject;
}
@@ -257,9 +250,6 @@ public class AntTypeDefinition {
|| !adaptToClass.isAssignableFrom(clazz))) {
TypeAdapter adapter = (TypeAdapter) createAndSet(
project, adapterClass);
- if (adapter == null) {
- throw new BuildException("Unable to create adapter object");
- }
adapter.checkProxyClass(clazz);
}
}
@@ -267,12 +257,11 @@ public class AntTypeDefinition {
/**
* Get the constructor of the definition
* and invoke it.
- * @return the instantiated <code>Object</code>.
+ * @return the instantiated <code>Object</code>, will never be null.
*/
private Object createAndSet(Project project, Class<?> c) {
try {
- Object o = innerCreateAndSet(c, project);
- return o;
+ return innerCreateAndSet(c, project);
} catch (InvocationTargetException ex) {
Throwable t = ex.getTargetException();
throw new BuildException(
[3/3] ant git commit: Remove the redundant nullcheck of value known
to be non-null.
Posted by bo...@apache.org.
Remove the redundant nullcheck of value known to be non-null.
This statement contains a redundant check of a known non-null s against the constant null.
http://findbugs.sourceforge.net/bugDescriptions.html#RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9ec11ae3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9ec11ae3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9ec11ae3
Branch: refs/heads/1.9.x
Commit: 9ec11ae3b04d5a8389a6f90b70463f16ecd541a2
Parents: 20fe0ff
Author: Kui LIU <br...@gmail.com>
Authored: Sat Oct 14 17:20:29 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Oct 15 07:25:19 2017 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/dispatch/DispatchUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/9ec11ae3/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
index 1a7c1f9..62dd88f 100644
--- a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
+++ b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
@@ -64,7 +64,7 @@ public class DispatchUtils {
final Object o = actionM.invoke(dispatchable, (Object[]) null);
if (o != null) {
final String s = o.toString();
- if (s != null && s.trim().length() > 0) {
+ if (s.trim().length() > 0) {
methodName = s.trim();
Method executeM = null;
executeM = dispatchable.getClass().getMethod(
[2/3] ant git commit: properly handle factory configuration exception
Posted by bo...@apache.org.
properly handle factory configuration exception
based on patch by Kui Liu
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/20fe0ffa
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/20fe0ffa
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/20fe0ffa
Branch: refs/heads/1.9.x
Commit: 20fe0ffaf6c8965beccad519c644df2321f5006c
Parents: 99a7f59
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Oct 15 07:24:40 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Oct 15 07:24:40 2017 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Diagnostics.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/20fe0ffa/src/main/org/apache/tools/ant/Diagnostics.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index 4ad57a0..e4a243b 100644
--- a/src/main/org/apache/tools/ant/Diagnostics.java
+++ b/src/main/org/apache/tools/ant/Diagnostics.java
@@ -195,8 +195,12 @@ public final class Diagnostics {
* @return parser or null for trouble
*/
private static SAXParser getSAXParser() {
- SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
- if (saxParserFactory == null) {
+ SAXParserFactory saxParserFactory = null;
+ try {
+ saxParserFactory = SAXParserFactory.newInstance();
+ } catch (Exception e) {
+ // ignore
+ ignoreThrowable(e);
return null;
}
SAXParser saxParser = null;