Browse Source

whitespace

master
Stefan Bodewig 7 years ago
parent
commit
38fed1a2fa
2 changed files with 18 additions and 18 deletions
  1. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
  2. +16
    -16
      src/main/org/apache/tools/ant/taskdefs/Jar.java

+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/JDBCTask.java View File

@@ -349,8 +349,8 @@ public abstract class JDBCTask extends Task {
info.put("password", getPassword()); info.put("password", getPassword());


for (Property p : connectionProperties) { for (Property p : connectionProperties) {
String name = p.getName();
String value = p.getValue();
String name = p.getName();
String value = p.getValue();
if (name == null || value == null) { if (name == null || value == null) {
log("Only name/value pairs are supported as connection properties.", log("Only name/value pairs are supported as connection properties.",
Project.MSG_WARN); Project.MSG_WARN);


+ 16
- 16
src/main/org/apache/tools/ant/taskdefs/Jar.java View File

@@ -860,23 +860,23 @@ public class Jar extends Zip {
log("Building MANIFEST-only jar: " log("Building MANIFEST-only jar: "
+ getDestFile().getAbsolutePath()); + getDestFile().getAbsolutePath());


try (ZipOutputStream zOut = new ZipOutputStream(getDestFile())) {
zOut.setEncoding(getEncoding());
zOut.setUseZip64(getZip64Mode().getMode());
if (isCompress()) {
zOut.setMethod(ZipOutputStream.DEFLATED);
} else {
zOut.setMethod(ZipOutputStream.STORED);
try (ZipOutputStream zOut = new ZipOutputStream(getDestFile())) {
zOut.setEncoding(getEncoding());
zOut.setUseZip64(getZip64Mode().getMode());
if (isCompress()) {
zOut.setMethod(ZipOutputStream.DEFLATED);
} else {
zOut.setMethod(ZipOutputStream.STORED);
}
initZipOutputStream(zOut);
finalizeZipOutputStream(zOut);
} catch (IOException ioe) {
throw new BuildException("Could not create almost empty JAR archive"
+ " (" + ioe.getMessage() + ")", ioe,
getLocation());
} finally {
createEmpty = false;
} }
initZipOutputStream(zOut);
finalizeZipOutputStream(zOut);
} catch (IOException ioe) {
throw new BuildException("Could not create almost empty JAR archive"
+ " (" + ioe.getMessage() + ")", ioe,
getLocation());
} finally {
createEmpty = false;
}
} }
return true; return true;
} }


Loading…
Cancel
Save