Merge branch 'release/5.5.2' into develop

# Conflicts: # current/core/pom.xml # current/pom.xml # current/ui.apps/pom.xml
brightcove · Jan 5, 2020 · a7ff577 · a7ff577
2 parents 8de83f1 + c5504f2
commit a7ff577
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -87,3 +87,4 @@ cs_commons-dev/
 /out/
 
 /current/prepareRelease.sh
+/.metadata/
diff --git a/current/core/pom.xml b/current/core/pom.xml
@@ -2,12 +2,7 @@
 <!--
  Adobe AEM Brightcove Connector
  
- Copyright (C) 2018 Coresecure Inc.
- 
- Authors:
- Alessandro Bonfatti
- Yan Kisen
- Pablo Kropilnicki
+ Copyright (C) 2019 3|SHARE Inc.
  
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -51,7 +46,7 @@
     <parent>
         <groupId>com.coresecure.brightcove.cq5</groupId>
         <artifactId>brightcove_connector</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.5.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brightcove-services</artifactId>

diff --git a/current/core/src/main/java/com/coresecure/brightcove/wrapper/utils/HttpServices.java b/current/core/src/main/java/com/coresecure/brightcove/wrapper/utils/HttpServices.java
@@ -410,7 +410,9 @@ public static JSONObject executeFullGet(String targetURL, String urlParameters,
         LOGGER.debug("executeFullGet: " + targetURL);
         URL url;
         URLConnection connection = null;
-
+        InputStream is = null;
+        ByteArrayOutputStream response = null;
+
         JSONObject exGetResponse = new JSONObject();
         try {
             // Create connection
@@ -420,7 +422,7 @@ public static JSONObject executeFullGet(String targetURL, String urlParameters,
                 connection = getSSLConnection(url, targetURL, HttpURLConnection.class);
             } else {
                 connection = getSSLConnection(url, targetURL, HttpsURLConnection.class);
-
+ 
             }
             connection.setRequestProperty(Constants.CONTENT_TYPE_HEADER,
                     com.adobe.granite.rest.Constants.CT_WWW_FORM_URLENCODED);
@@ -436,27 +438,39 @@ public static JSONObject executeFullGet(String targetURL, String urlParameters,
             connection.setDoOutput(true);
             connection.connect();
             // Get Response
-            InputStream is = connection.getInputStream();
-
-            ByteArrayOutputStream response = new ByteArrayOutputStream();
-
+            is = connection.getInputStream();
+ 
+            response = new ByteArrayOutputStream();
+ 
             byte[] buffer = new byte[4096];
             int n;
-
+ 
             while ((n = is.read(buffer)) != -1) {
                 response.write(buffer, 0, n);
             }
             LOGGER.trace("response committed!");
-
+ 
             exGetResponse.put(Constants.RESPONSE, new String(response.toByteArray(), "UTF-8"));
             exGetResponse.put(Constants.BINARY, response.toByteArray());
             exGetResponse.put(Constants.MIME_TYPE, connection.getContentType());
         } catch (Exception e) {
             LOGGER.error(Constants.ERROR_LOG_TMPL, e);
         } finally {
-
-            if (connection != null) {
-                connection = null;
+            if (null != is) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    LOGGER.error(Constants.ERROR_LOG_TMPL,e);
+               }
+            }
+            if (null != response) {
+                try {
+                    response.flush();
+                    response.close();
+                } catch (IOException e) {
+
+                    LOGGER.error(Constants.ERROR_LOG_TMPL, e);
+                }
             }
         }
         return exGetResponse;

diff --git a/current/pom.xml b/current/pom.xml
@@ -2,12 +2,7 @@
 <!--
  Adobe AEM Brightcove Connector
 
- Copyright (C) 2018 Coresecure Inc.
-
- Authors:
-   Alessandro Bonfatti
-   Yan Kisen
-   Pablo Kropilnicki
+Copyright (C) 2019 3|SHARE Inc.
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -50,7 +45,7 @@
     <groupId>com.coresecure.brightcove.cq5</groupId>
     <artifactId>brightcove_connector</artifactId>
     <packaging>pom</packaging>
-    <version>5.5.2-SNAPSHOT</version>
+    <version>5.5.3-SNAPSHOT</version>
     <description>
         Parent Maven POM for the 'Adobe CQ5 Brightcove Connector API' project.
     </description>

diff --git a/current/ui.apps/pom.xml b/current/ui.apps/pom.xml
@@ -2,12 +2,7 @@
 <!--
  Adobe AEM Brightcove Connector
  
- Copyright (C) 2018 Coresecure Inc.
- 
- Authors:
- Alessandro Bonfatti
- Yan Kisen
- Pablo Kropilnicki
+ Copyright (C) 2019 3|SHARE Inc.
  
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -54,7 +49,7 @@
     <parent>
         <groupId>com.coresecure.brightcove.cq5</groupId>
         <artifactId>brightcove_connector</artifactId>
-        <version>5.5.2-SNAPSHOT</version>
+        <version>5.5.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -232,7 +227,7 @@
         <dependency>
             <groupId>com.coresecure.brightcove.cq5</groupId>
             <artifactId>brightcove-services</artifactId>
-            <version>5.5.2-SNAPSHOT</version>
+            <version>5.5.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -87,3 +87,4 @@ cs_commons-dev/
		/out/

		/current/prepareRelease.sh
		/.metadata/