Author: jglick
Date: Mon Mar 5 18:52:36 2012
New Revision: 1297169
URL: http://svn.apache.org/viewvc?rev=1297169&view=rev
Log:
NS_DANGEROUS_NON_SHORT_CIRCUIT
Modified:
ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java
Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java?rev=1297169&r1=1297168&r2=1297169&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java Mon Mar
5 18:52:36 2012
@@ -349,7 +349,7 @@ public class ZipOutputStream extends Fil
public void setEncoding(final String encoding) {
this.encoding = encoding;
this.zipEncoding = ZipEncodingHelper.getZipEncoding(encoding);
- useUTF8Flag &= ZipEncodingHelper.isUTF8(encoding);
+ useUTF8Flag = useUTF8Flag && ZipEncodingHelper.isUTF8(encoding);
}
/**
