csantanapr closed pull request #3117: Add support for Java actions.
URL: https://github.com/apache/incubator-openwhisk/pull/3117
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/actionRuntimes/actionProxy/invoke.py
b/actionRuntimes/actionProxy/invoke.py
index 2fb54a6e2f..b4957f58c4 100755
--- a/actionRuntimes/actionProxy/invoke.py
+++ b/actionRuntimes/actionProxy/invoke.py
@@ -33,6 +33,7 @@
import re
import sys
import json
+import base64
import requests
import codecs
import traceback
@@ -90,9 +91,10 @@ def init(args):
main = args.main
artifact = args.artifact
- if artifact and (artifact.endswith('.zip') or artifact.endswith('tgz')):
+ if artifact and (artifact.endswith('.zip') or artifact.endswith('tgz') or
artifact.endswith('jar')):
with open(artifact, 'rb') as fp:
- contents = fp.read().encode('base64')
+ contents = fp.read()
+ contents = base64.b64encode(contents)
binary = True
elif artifact is not '':
with(codecs.open(artifact, 'r', 'utf-8')) as fp:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
