Author: peterreilly
Date: Mon Sep 3 06:29:04 2007
New Revision: 572329
URL: http://svn.apache.org/viewvc?rev=572329&view=rev
Log:
change some usages that assumed null from readfully
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/filters/ClassConstants.java
ant/core/trunk/src/main/org/apache/tools/ant/filters/ExpandProperties.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/filters/ClassConstants.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/ClassConstants.java?rev=572329&r1=572328&r2=572329&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/ClassConstants.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/ClassConstants.java
Mon Sep 3 06:29:04 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/trunk/src/main/org/apache/tools/ant/filters/ExpandProperties.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/ExpandProperties.java?rev=572329&r1=572328&r2=572329&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/ExpandProperties.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/ExpandProperties.java
Mon Sep 3 06:29:04 2007
@@ -84,7 +84,7 @@
}
} else {
queuedData = readFully();
- if (queuedData == null) {
+ if (queuedData.length() == 0) {
ch = -1;
} else {
Project project = getProject();
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java?rev=572329&r1=572328&r2=572329&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
Mon Sep 3 06:29:04 2007
@@ -164,7 +164,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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
