You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2007/09/03 15:36:17 UTC
svn commit: r572334 - in
/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant:
filters/ClassConstants.java filters/ExpandProperties.java
taskdefs/LoadProperties.java
Author: peterreilly
Date: Mon Sep 3 06:36:16 2007
New Revision: 572334
URL: http://svn.apache.org/viewvc?rev=572334&view=rev
Log:
sync
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ClassConstants.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ExpandProperties.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ClassConstants.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ClassConstants.java?rev=572334&r1=572333&r2=572334&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ClassConstants.java (original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ClassConstants.java Mon Sep 3 06:36:16 2007
@@ -101,7 +101,7 @@
}
} else {
final String clazz = readFully();
- if (clazz == null) {
+ if (clazz == null || clazz.length() == 0) {
ch = -1;
} else {
final byte[] bytes = clazz.getBytes("ISO-8859-1");
Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ExpandProperties.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ExpandProperties.java?rev=572334&r1=572333&r2=572334&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ExpandProperties.java (original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/filters/ExpandProperties.java Mon Sep 3 06:36:16 2007
@@ -84,7 +84,7 @@
}
} else {
queuedData = readFully();
- if (queuedData == null) {
+ if (queuedData.length() == 0) {
ch = -1;
} else {
Project project = getProject();
Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java?rev=572334&r1=572333&r2=572334&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java (original)
+++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java Mon Sep 3 06:36:16 2007
@@ -171,7 +171,7 @@
String text = crh.readFully(instream);
- if (text != null) {
+ if (text != null && text.length() != 0) {
if (!text.endsWith("\n")) {
text = text + "\n";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org