[1/2] camel git commit: fix: Avoid NPE when parsing of connector jar from Nexus fails

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x cddb41191 -> cb274125a
  refs/heads/master cb8156d6c -> 6a6bfdd38


fix: Avoid NPE when parsing of connector jar from Nexus fails


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a6bfdd3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a6bfdd3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a6bfdd3

Branch: refs/heads/master
Commit: 6a6bfdd38a5e3e7d0e662c23efa0e6a0a575ef45
Parents: cb8156d
Author: Roland Huß <rol...@ro14nd.de>
Authored: Sat Sep 23 10:55:57 2017 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Sat Sep 23 11:00:03 2017 +0200

----------------------------------------------------------------------
 .../camel/catalog/nexus/ConnectorCatalogNexusRepository.java      | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6a6bfdd3/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
----------------------------------------------------------------------
diff --git 
a/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
 
b/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
index 8c5633d..5cf1e03 100644
--- 
a/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
+++ 
b/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ConnectorCatalogNexusRepository.java
@@ -140,6 +140,7 @@ public class ConnectorCatalogNexusRepository extends 
BaseNexusRepository {
             }
         } catch (Throwable e) {
             logger.warn("Error loading " + path + " file", e);
+            return null;
         }
 
         path = "camel-connector-schema.json";
@@ -150,6 +151,7 @@ public class ConnectorCatalogNexusRepository extends 
BaseNexusRepository {
             }
         } catch (Throwable e) {
             logger.warn("Error loading " + path + " file", e);
+            return null;
         }
 
         path = "camel-component-schema.json";
@@ -160,6 +162,7 @@ public class ConnectorCatalogNexusRepository extends 
BaseNexusRepository {
             }
         } catch (Throwable e) {
             logger.warn("Error loading " + path + " file", e);
+            return null;
         }
 
         return answer;