You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/08/29 05:51:55 UTC
[archiva] 01/02: Fixing MPE
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch feature/storage_refactoring
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit ee382e76f4cc18a2b7cd9f1aa5590a53b2b83051
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Aug 29 07:51:16 2019 +0200
Fixing MPE
---
.../archiva/metadata/repository/jcr/JcrMetadataRepository.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
index d650abb..1ed5841 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
@@ -313,6 +313,7 @@ public class JcrMetadataRepository
n.setProperty("systemPath", dependency.getSystemPath());
n.setProperty("optional", dependency.isOptional());
n.setProperty("projectId", dependency.getProjectId());
+ // TODO: Fixig
Node refNode = findArtifactNode(jcrSession, dependency.getNamespace(),
dependency.getProjectId(), dependency.getVersion(), dependency.getArtifactId());
if (refNode!=null) {
@@ -1646,7 +1647,9 @@ public class JcrMetadataRepository
private Node findArtifactNode(Session jcrSession, String namespace, String projectId,
String projectVersion, String id) throws RepositoryException {
-
+ if (namespace==null || projectId==null||projectVersion==null||id==null) {
+ return null;
+ }
Node root = jcrSession.getRootNode();
Node node = JcrUtils.getOrAddNode(root, "repositories");
for (Node n : JcrUtils.getChildNodes(node)) {