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 2018/02/10 18:03:52 UTC
[2/2] ant git commit: whitespace
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/38fed1a2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/38fed1a2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/38fed1a2
Branch: refs/heads/master
Commit: 38fed1a2fab29373a3b2891f6612a7beb68f65c3
Parents: 4cacf92
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Feb 10 18:50:08 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Feb 10 18:59:19 2018 +0100
----------------------------------------------------------------------
.../org/apache/tools/ant/taskdefs/JDBCTask.java | 4 +--
src/main/org/apache/tools/ant/taskdefs/Jar.java | 32 ++++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/38fed1a2/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
index 3b8dd46..5f3da78 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
@@ -349,8 +349,8 @@ public abstract class JDBCTask extends Task {
info.put("password", getPassword());
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) {
log("Only name/value pairs are supported as connection properties.",
Project.MSG_WARN);
http://git-wip-us.apache.org/repos/asf/ant/blob/38fed1a2/src/main/org/apache/tools/ant/taskdefs/Jar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index 73a871f..3797e89 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -860,23 +860,23 @@ public class Jar extends Zip {
log("Building MANIFEST-only jar: "
+ 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;
}