From fca4fe69ed1addce3deca961af87e49b6a4983fb Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Mon, 5 Mar 2012 18:52:36 +0000
Subject: [PATCH] NS_DANGEROUS_NON_SHORT_CIRCUIT

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1297169 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/zip/ZipOutputStream.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java
index c1d73b3df..0d222912e 100644
--- a/src/main/org/apache/tools/zip/ZipOutputStream.java
+++ b/src/main/org/apache/tools/zip/ZipOutputStream.java
@@ -349,7 +349,7 @@ public class ZipOutputStream extends FilterOutputStream {
     public void setEncoding(final String encoding) {
         this.encoding = encoding;
         this.zipEncoding = ZipEncodingHelper.getZipEncoding(encoding);
-        useUTF8Flag &= ZipEncodingHelper.isUTF8(encoding);
+        useUTF8Flag = useUTF8Flag && ZipEncodingHelper.isUTF8(encoding);
     }
 
     /**