Github user trkurc commented on a diff in the pull request:

    https://github.com/apache/nifi/pull/170#discussion_r49537793
  
    --- Diff: 
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PGPUtil.java
 ---
    @@ -46,9 +46,8 @@
         public static final int BUFFER_SIZE = 65536;
         public static final int BLOCK_SIZE = 4096;
     
    -    public static void encrypt(InputStream in, OutputStream out, String 
algorithm, String provider, int cipher, String filename,
    -                               PGPKeyEncryptionMethodGenerator 
encryptionMethodGenerator) throws IOException, PGPException {
    -
    +    public static void encrypt(InputStream in, OutputStream out, String 
algorithm, String provider, int cipher, String filename, 
PGPKeyEncryptionMethodGenerator encryptionMethodGenerator) throws
    +            IOException, PGPException {
             final boolean isArmored = 
EncryptContent.isPGPArmoredAlgorithm(algorithm);
    --- End diff --
    
    @alopresto - rather than continuing to add to this PR, it looks like 
@mcgilman merged almost everything in, I think, other than the version number 
bump. If there are other changes, I think your branch has veered enough away 
from master that you may want to start from master.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to