Browse Source

change some usages that assumed null from readfully

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@572329 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 18 years ago
parent
commit
9249e9eba5
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/filters/ClassConstants.java
  2. +1
    -1
      src/main/org/apache/tools/ant/filters/ExpandProperties.java
  3. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/LoadProperties.java

+ 1
- 1
src/main/org/apache/tools/ant/filters/ClassConstants.java View File

@@ -101,7 +101,7 @@ public final class ClassConstants
}
} 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");


+ 1
- 1
src/main/org/apache/tools/ant/filters/ExpandProperties.java View File

@@ -84,7 +84,7 @@ public final class ExpandProperties
}
} else {
queuedData = readFully();
if (queuedData == null) {
if (queuedData.length() == 0) {
ch = -1;
} else {
Project project = getProject();


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/LoadProperties.java View File

@@ -164,7 +164,7 @@ public class LoadProperties extends Task {

String text = crh.readFully(instream);

if (text != null) {
if (text != null && text.length() != 0) {
if (!text.endsWith("\n")) {
text = text + "\n";
}


Loading…
Cancel
Save