Merge pull request #655 from maxm123/master

Use protected superclass fields via super because of GROOVY-9292
GradleUp · Mar 30, 2021 · 37fcc73 · 37fcc73
2 parents 1295491 + 03e9326
commit 37fcc73
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ovy/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer.groovy b/...ovy/com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer.groovy
@@ -107,15 +107,15 @@ class ServiceFileTransformer implements Transformer, PatternFilterable {
         }
 
         public void append( InputStream is ) throws IOException {
-            if ( count > 0 && buf[count - 1] != '\n' && buf[count - 1] != '\r' ) {
+            if ( super.count > 0 && super.buf[super.count - 1] != '\n' && super.buf[super.count - 1] != '\r' ) {
                 byte[] newline = '\n'.bytes
                 write(newline, 0, newline.length)
             }
             IOUtil.copy(is, this)
         }
 
         public InputStream toInputStream() {
-            return new ByteArrayInputStream( buf, 0, count )
+            return new ByteArrayInputStream( super.buf, 0, super.count )
         }
     }